From 04e0151c22622662e7d7081f974b3ff78348ee74 Mon Sep 17 00:00:00 2001 From: nguyenvukhang Date: Tue, 31 Jan 2023 20:27:00 +0800 Subject: [PATCH] ci: package the installer --- .github/workflows/ci.yml | 40 ++++++------------- deploy/windows/config/config.xml | 9 +++++ .../data/installcontent.txt | 2 + .../meta/package.xml | 8 ++++ 4 files changed, 31 insertions(+), 28 deletions(-) create mode 100644 deploy/windows/config/config.xml create mode 100644 deploy/windows/packages/com.nguyenvukhang.canvassync/data/installcontent.txt create mode 100644 deploy/windows/packages/com.nguyenvukhang.canvassync/meta/package.xml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b6bfd0..c420b8d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -85,6 +85,7 @@ jobs: with: arch: win64_msvc2019_64 version: ${{ matrix.version }} + tools: tools_ifw - name: Install MSVC 2022 uses: ilammy/msvc-dev-cmd@v1 @@ -103,20 +104,21 @@ jobs: -DCMAKE_PREFIX_PATH=${{ env.Qt6_DIR }} cmake --build build - - name: Use windeployqt to add libraries + - name: Use windeployqt to load libraries shell: bash run: | - cd build + mv build/CanvasSync.exe \ + deploy/windows/packages/com.nguyenvukhang.canvassync/data + cd deploy/windows/packages/com.nguyenvukhang.canvassync/data $Qt6_DIR/bin/windeployqt.exe CanvasSync.exe - # collect app - - shell: bash + - name: Package the installer + shell: bash run: | - ls build - cp build/CanvasSync.exe ${{ env.ASSET }} - cd build - tar -zcvf pack-${{ matrix.os }}.tar.gz * - mv pack-${{ matrix.os }}.tar.gz .. + cd deploy/windows + $IQTA_TOOLS/QtInstallerFramework/4.5/bin/binarycreator.exe \ + -c config/config.xml -p packages CanvasSyncInstaller-${{ matrix.os }}.exe + mv CanvasSyncInstaller-${{ matrix.os }}.exe ../.. # upload release package - name: Release @@ -124,23 +126,5 @@ jobs: if: startsWith(github.ref, 'refs/tags/') with: files: | - ${{ env.ASSET }} - pack-${{ matrix.os }}.tar.gz + CanvasSyncInstaller-${{ matrix.os }}.exe generate_release_notes: true - - test: - strategy: - fail-fast: false - matrix: - include: - - os: windows-2019 - - os: windows-2022 - runs-on: ${{ matrix.os }} - steps: - - name: Install build dependencies - shell: bash - run: cinst -y ninja ilmerge - - run: ilmerge - if: ${{ always() }} - - run: ilmerge.exe - if: ${{ always() }} diff --git a/deploy/windows/config/config.xml b/deploy/windows/config/config.xml new file mode 100644 index 0000000..ad1b8dd --- /dev/null +++ b/deploy/windows/config/config.xml @@ -0,0 +1,9 @@ + + + Canvas Sync + 1.0.0 + Canvas Sync Installer + Nguyen Vu Khang + Super App + @ApplicationsDir@/CanvasSync + diff --git a/deploy/windows/packages/com.nguyenvukhang.canvassync/data/installcontent.txt b/deploy/windows/packages/com.nguyenvukhang.canvassync/data/installcontent.txt new file mode 100644 index 0000000..f400019 --- /dev/null +++ b/deploy/windows/packages/com.nguyenvukhang.canvassync/data/installcontent.txt @@ -0,0 +1,2 @@ +This file will be installed into the target directory.... + diff --git a/deploy/windows/packages/com.nguyenvukhang.canvassync/meta/package.xml b/deploy/windows/packages/com.nguyenvukhang.canvassync/meta/package.xml new file mode 100644 index 0000000..e6861e7 --- /dev/null +++ b/deploy/windows/packages/com.nguyenvukhang.canvassync/meta/package.xml @@ -0,0 +1,8 @@ + + + Canvas Sync + Syncs local folders with folders on canvas. + 0.1.0-1 + 2010-09-21 + true +