Test packaging

This commit is contained in:
Shaun Reed 2023-01-14 19:01:34 -05:00
parent cf433ad7fc
commit 404aa51055
6 changed files with 81 additions and 13 deletions

View File

@ -37,8 +37,30 @@ jobs:
- name: Build Qtk - name: Build Qtk
shell: bash shell: bash
run: | run: |
cmake -S . -B build/ ${{ matrix.cmake }} -DQTK_UPDATE_SUBMODULES=ON && cmake --build build/ \ cmake -B build/ ${{ matrix.cmake }} -DQTK_UPDATE_SUBMODULES=ON
--target qtk-main 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: |
cmake --build build/ --target package_source
- uses: actions/upload-artifact@v3
with:
name: qtk-packages-${{ matrix.os }}
path: build/packages/
- uses: actions/upload-artifact@v3
with:
name: qtk-${{ matrix.os }}
path: build/bin
Build-Qtk-Assimp-Targets: Build-Qtk-Assimp-Targets:
strategy: strategy:
@ -75,5 +97,54 @@ jobs:
- name: Build Qtk - name: Build Qtk
shell: bash shell: bash
run: | run: |
cmake -S . -B build/ ${{ matrix.cmake }} && cmake --build build/ \ cmake -B build/ ${{ matrix.cmake }} && cmake --build build/ --target qtk-main
--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/

Binary file not shown.

Before

Width:  |  Height:  |  Size: 406 KiB

After

Width:  |  Height:  |  Size: 316 KiB

View File

@ -41,4 +41,6 @@ set(CPACK_PACKAGE_VERSION_MINOR "${PROJECT_VERSION_MINOR}")
set(CPACK_PACKAGE_VENDOR "Shaun Reed") set(CPACK_PACKAGE_VENDOR "Shaun Reed")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Qt OpenGL 3D graphics library.") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Qt OpenGL 3D graphics library.")
set(CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/shaunrd0/qtk") set(CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/shaunrd0/qtk")
set(CPACK_SOURCE_IGNORE_FILES build;install;\.git;\.github;\.idea)
set(CPACK_PACKAGE_DIRECTORY packages/)
include(CPack) include(CPack)

View File

@ -95,10 +95,3 @@ set_target_properties(
MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION} MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} 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
)

View File

@ -6,8 +6,8 @@
## Contact: shaunrd0@gmail.com | URL: www.shaunreed.com | GitHub: shaunrd0 ## ## Contact: shaunrd0@gmail.com | URL: www.shaunreed.com | GitHub: shaunrd0 ##
##############################################################################*/ ##############################################################################*/
#include "examplescene.h"
#include "qtkmainwindow.h" #include "qtkmainwindow.h"
#include "examplescene.h"
#include "ui_qtkmainwindow.h" #include "ui_qtkmainwindow.h"
MainWindow * MainWindow::mainWindow_ = Q_NULLPTR; MainWindow * MainWindow::mainWindow_ = Q_NULLPTR;

View File

@ -27,7 +27,9 @@
* This cannot be defined within any namespace, but can be called by ctors. * This cannot be defined within any namespace, but can be called by ctors.
* See object.h for example. * See object.h for example.
*/ */
inline void initResources() { Q_INIT_RESOURCE(resources); } inline void initResources() {
Q_INIT_RESOURCE(resources);
}
namespace Qtk { namespace Qtk {
/** /**