diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 818a594..bfd6fe7 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -8,7 +8,7 @@ on: jobs: windows-msvc: runs-on: windows-2019 - name: windows-msvc-qt-${{ matrix.qt_version }}-${{ matrix.build_type }} + name: windows-msvc${{ matrix.arch }}-qt-${{ matrix.qt_version }}-${{ matrix.build_type }} strategy: fail-fast: false matrix: @@ -46,10 +46,7 @@ jobs: mkdir build cd build - cmake -DQARCHIVE_QT_VERSION_MAJOR=5 \ - -DQARCHIVE_CONAN_BUILD=ON \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} .. + cmake -DQARCHIVE_QT_VERSION_MAJOR=5 -DQARCHIVE_CONAN_BUILD=ON -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} .. cmake --build . --config ${{ matrix.build_type }} cmake --install . --prefix=${{ github.workspace }}/output/QArchive cd .. @@ -81,6 +78,7 @@ jobs: matrix: qt_version: [5.15.2] platform: ['MINGW64'] + build_type: [Release] defaults: run: shell: msys2 {0} @@ -116,24 +114,16 @@ jobs: mkdir build cd build - cmake -DQARCHIVE_QT_VERSION_MAJOR=5 \ - -DQARCHIVE_CONAN_BUILD=ON \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} .. + cmake -DQARCHIVE_QT_VERSION_MAJOR=5 -DQARCHIVE_CONAN_BUILD=ON -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} .. cmake --build . --config ${{ matrix.build_type }} cmake --install . --prefix=${{ github.workspace }}/output/QArchive cd .. cd output mkdir upload - 7z a windows-${{matrix.platform}}-qt-${{matrix.qt_version}}.zip QArchive - cp windows-${{matrix.platform}}-qt-${{matrix.qt_version}}.zip upload/ + 7z a windows-${{matrix.platform}}-qt-${{matrix.qt_version}}-${{matrix.build_type}}.zip QArchive + cp windows-${{matrix.platform}}-qt-${{matrix.qt_version}}-${{matrix.build_type}}.zip upload/ wget "https://github.com/tcnksm/ghr/releases/download/v0.16.2/ghr_v0.16.2_windows_amd64.zip" 7z x ghr_v0.16.2_windows_amd64.zip - ghr_v0.16.2_windows_amd64/ghr.exe -u antony-jr \ - -r QArchive \ - -t ${{ secrets.GITHUB_TOKEN }} \ - -replace \ - -prerelease \ - prebuilt upload/ + ghr_v0.16.2_windows_amd64/ghr.exe -u antony-jr -r QArchive -t ${{ secrets.GITHUB_TOKEN }} -replace -prerelease prebuilt upload/