From adcc21828e1a66a28448948cf676d429b7beaf30 Mon Sep 17 00:00:00 2001 From: QwQ <59914293+Qv2ray-dev@users.noreply.github.com> Date: Wed, 5 Aug 2020 16:05:49 +0800 Subject: [PATCH] fix: enable debug build CI --- .github/workflows/build-qv2ray-cmake.yml | 23 ++++++++++++----------- makespec/BUILDVERSION | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-qv2ray-cmake.yml b/.github/workflows/build-qv2ray-cmake.yml index c33ccfae..7d60f10f 100644 --- a/.github/workflows/build-qv2ray-cmake.yml +++ b/.github/workflows/build-qv2ray-cmake.yml @@ -25,6 +25,7 @@ jobs: matrix: qt_version: [5.15.0] platform: [ubuntu-16.04, macos-latest, windows-latest] + build_type: [Debug, Release] arch: [x86, x64] include: - platform: windows-latest @@ -121,7 +122,7 @@ jobs: run: | mkdir build cd build - cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 -DDS_STORE_SCRIPT=ON + cmake .. -GNinja -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 -DDS_STORE_SCRIPT=ON cmake --build . --parallel $(sysctl -n hw.logicalcpu) sudo cmake --install . appdmg ../assets/package_dmg.json ../Qv2ray.dmg @@ -135,7 +136,7 @@ jobs: run: | mkdir build cd build - cmake .. -GNinja -DCMAKE_INSTALL_PREFIX=./deployment -DCMAKE_BUILD_TYPE=Release + cmake .. -GNinja -DCMAKE_INSTALL_PREFIX=./deployment -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} cmake --build . --parallel $(nproc) cmake --install . # -------------------------------------------------------- @@ -148,7 +149,7 @@ jobs: run: | mkdir build cd build - cmake .. -GNinja -DCMAKE_INSTALL_PREFIX=./AppDir/usr -DCMAKE_BUILD_TYPE=Release -DQV2RAY_TRANSLATION_PATH=QApplication::applicationDirPath\(\)+"/../share/qv2ray/lang" + cmake .. -GNinja -DCMAKE_INSTALL_PREFIX=./AppDir/usr -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DQV2RAY_TRANSLATION_PATH=QApplication::applicationDirPath\(\)+"/../share/qv2ray/lang" cmake --build . --parallel $(nproc) cmake --install . # ========================================================================================================= Deployments @@ -174,15 +175,15 @@ jobs: cd .. squashfs-root/AppRun AppDir/usr/share/applications/qv2ray.desktop -appimage -no-strip -always-overwrite mv ./Qv2ray*.AppImage ./Qv2ray.AppImage - - name: Linux - ${{ matrix.qt_version }} - Uploading artifact + - name: Linux - ${{ matrix.qt_version }} - Uploading Artifact if: matrix.platform == 'ubuntu-16.04' uses: actions/upload-artifact@master with: - name: Qv2ray-${{ github.sha }}.linux-${{ matrix.arch }}.qt${{ matrix.qt_version }}.AppImage + name: Qv2ray-${{ github.sha }}.linux-${{ matrix.arch }}.qt${{ matrix.qt_version }}-${{ matrix.build_type }}.AppImage path: build/Qv2ray.AppImage - name: Linux - ${{ matrix.qt_version }} - Upload binaries to release uses: svenstaro/upload-release-action@v1-release - if: github.event_name == 'release' && matrix.platform == 'ubuntu-16.04' && matrix.qt_version == '5.15.0' + if: github.event_name == 'release' && matrix.platform == 'ubuntu-16.04' && matrix.qt_version == '5.15.0' && matrix.build_type == 'Release' with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: build/Qv2ray.AppImage @@ -194,11 +195,11 @@ jobs: if: matrix.platform == 'macos-latest' uses: actions/upload-artifact@master with: - name: Qv2ray-${{ github.sha }}.macOS-${{ matrix.arch }}.qt${{ matrix.qt_version }}.dmg + name: Qv2ray-${{ github.sha }}.macOS-${{ matrix.arch }}.qt${{ matrix.qt_version }}-${{ matrix.build_type }}.dmg path: Qv2ray.dmg - name: macOS - ${{ matrix.qt_version }} - Upload binaries to release uses: svenstaro/upload-release-action@v1-release - if: github.event_name == 'release' && matrix.platform == 'macos-latest' && matrix.qt_version == '5.15.0' + if: github.event_name == 'release' && matrix.platform == 'macos-latest' && matrix.qt_version == '5.15.0' && matrix.build_type == 'Release' with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: Qv2ray.dmg @@ -212,15 +213,15 @@ jobs: with: pathSource: ./build/deployment/ pathTarget: ./release.7z - - name: Win-${{ matrix.arch }} - ${{ matrix.qt_version }} - Uploading artifact + - name: Win-${{ matrix.arch }} - ${{ matrix.qt_version }} - Uploading Artifact if: matrix.platform == 'windows-latest' uses: actions/upload-artifact@master with: - name: Qv2ray-${{ github.sha }}.Windows-${{ matrix.arch }}.qt${{ matrix.qt_version }}.7z + name: Qv2ray-${{ github.sha }}.Windows-${{ matrix.arch }}.qt${{ matrix.qt_version }}-${{ matrix.build_type }}.7z path: release.7z - name: Win-${{ matrix.arch }} - ${{ matrix.qt_version }} - Upload binaries to release uses: svenstaro/upload-release-action@v1-release - if: github.event_name == 'release' && matrix.platform == 'windows-latest' && matrix.qt_version == '5.15.0' + if: github.event_name == 'release' && matrix.platform == 'windows-latest' && matrix.qt_version == '5.15.0' && matrix.build_type == 'Release' with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: release.7z diff --git a/makespec/BUILDVERSION b/makespec/BUILDVERSION index b272195b..026d5ea4 100644 --- a/makespec/BUILDVERSION +++ b/makespec/BUILDVERSION @@ -1 +1 @@ -5861 +5862