diff --git a/.github/workflows/all-builds.yml b/.github/workflows/all-builds.yml index efacc92..df3f9eb 100644 --- a/.github/workflows/all-builds.yml +++ b/.github/workflows/all-builds.yml @@ -37,8 +37,37 @@ jobs: - name: Build Qtk shell: bash run: | - cmake -S . -B build/ ${{ matrix.cmake }} -DQTK_UPDATE_SUBMODULES=ON && cmake --build build/ \ - --target qtk-main + cmake -B build/ ${{ matrix.cmake }} -DQTK_UPDATE_SUBMODULES=ON + cmake --build build/ + + - name: Package libqtk + shell: bash + run: | + mkdir pack-libqtk/ + cd pack-libqtk/ + cmake --build ../build --target package + + - name: Package Qtk Sources + shell: bash + run: | + mkdir pack-qtk-sources + cd pack-qtk-sources + cmake --build ../build --target package_source + + - uses: actions/upload-artifact@v3 + with: + name: libqtk-${{ matrix.os }} + path: pack-libqtk/* + + - uses: actions/upload-artifact@v3 + with: + name: qtk-sources${{ matrix.os }} + path: pack-qtk-sources/* + + - uses: actions/upload-artifact@v3 + with: + name: qtk-${{ matrix.os }} + path: build/ Build-Qtk-Assimp-Targets: strategy: @@ -75,5 +104,54 @@ jobs: - name: Build Qtk shell: bash run: | - cmake -S . -B build/ ${{ matrix.cmake }} && cmake --build build/ \ - --target qtk-main + cmake -B build/ ${{ matrix.cmake }} && cmake --build build/ --target qtk-main + + # TODO: Enable with tag only when done testing + Release-Qtk: + needs: Build-Qtk + if: "always()" + strategy: + fail-fast: false + matrix: + os: [ubuntu-latest, windows-latest, macos-latest] + include: + - os: ubuntu-latest + cqt: CQtDeployer.run + url: https://github.com/QuasarApp/CQtDeployer/releases/download/v1.6.2277/CQtDeployer_1.6.2277.ecc6eed_Linux_x86_64.run + qmake: /home/runner/work/qtk/Qt/6.3.1/gcc_64/bin/qmake + - os: windows-latest + cqt: CQtDeployer.exe + url: https://github.com/QuasarApp/CQtDeployer/releases/download/v1.6.2277/CQtDeployer_1.6.2277.ecc6eed_Windows_AMD64.exe + qmake: D:/a/qtk/qtk/Qt/6.3.1/mingw81_64/bin/qmake + - os: macos-latest + cqt: CQtDeployer.run + url: https://github.com/QuasarApp/CQtDeployer/releases/download/v1.6.2277/CQtDeployer_1.6.2277.ecc6eed_Linux_x86_64.run + qmake: /home/runner/work/qtk/Qt/6.3.1/gcc_64/bin/qmake + runs-on: ${{ matrix.os }} + + steps: + - uses: actions/download-artifact@v3 + with: + name: qtk-${{ matrix.os }} + + - name: Ls + shell: bash + run: ls -l -a + + - name: Install Qt + uses: jurplel/install-qt-action@v2 + with: + version: '6.3.1' + + - name: Package Qtk + shell: bash + run: | + wget -O ${{ matrix.cqt }} ${{ matrix.url }} + chmod +x ${{ matrix.cqt }} + ./${{ matrix.cqt }} install + cqtdeployer -bin build/bin/qtk-main -qmake ${{ matrix.qmake }} + + - uses: actions/upload-artifact@v3 + with: + name: qtk-installer-${{ matrix.os }} + path: DistributionKit/ diff --git a/resources/screenshot.png b/resources/screenshot.png index d8729df..2802538 100644 Binary files a/resources/screenshot.png and b/resources/screenshot.png differ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d0bc7a2..8fa59d2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -41,4 +41,5 @@ set(CPACK_PACKAGE_VERSION_MINOR "${PROJECT_VERSION_MINOR}") set(CPACK_PACKAGE_VENDOR "Shaun Reed") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Qt OpenGL 3D graphics library.") set(CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/shaunrd0/qtk") +set(CPACK_SOURCE_IGNORE_FILES build;install;\.git;\.github;\.idea) include(CPack) diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 4b7df6a..bb24646 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -95,10 +95,3 @@ set_target_properties( MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION} MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} ) - -install( - TARGETS qtk-main - BUNDLE DESTINATION bin - RUNTIME DESTINATION bin - LIBRARY DESTINATION bin/lib -)