diff options
| author | Saturneric <[email protected]> | 2023-02-25 11:15:32 +0000 |
|---|---|---|
| committer | Saturneric <[email protected]> | 2023-02-25 11:15:32 +0000 |
| commit | 1b41069068d93155db87ff053b99f91c8d1d8b32 (patch) | |
| tree | f471c2c9bcd473ecb42711ad4004a1370583c8d9 | |
| parent | feat: use aqt to install qt in ci build (diff) | |
| download | GpgFrontend-1b41069068d93155db87ff053b99f91c8d1d8b32.tar.gz GpgFrontend-1b41069068d93155db87ff053b99f91c8d1d8b32.zip | |
feat: improve ci build config
1. upgrade to actions/cache@v3
2. codeql is now using qt6
| -rw-r--r-- | .github/workflows/codeql-analysis.yml | 35 | ||||
| -rw-r--r-- | .github/workflows/debug.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/release.yml | 4 |
3 files changed, 14 insertions, 27 deletions
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f196e58c..39a4f7bd 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -91,36 +91,23 @@ jobs: cd ${{github.workspace}} - name: Cache Qt - id: cache-qt - uses: actions/cache@v1 + id: cache-qt-6 + uses: actions/cache@v3 with: path: ../Qt - key: ${{ runner.os }}-QtCache + key: ${{ runner.os }}-qt-cache-6 - name: Install Qt - uses: jurplel/install-qt-action@v2 + uses: jurplel/install-qt-action@v3 with: + version: '6.4.2' + modules: 'qt5compat' cached: ${{ steps.cache-qt.outputs.cache-hit }} - - name: Configure CMake - # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. - # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type - run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGPGFRONTEND_BUILD_TYPE_TEST_UI=ON - - - name: Build GpgFrontend - # Build your program with the given configuration - run: cmake --build ${{github.workspace}}/build --config {{$env.BUILD_TYPE}} -- -v - - # âšī¸ Command-line programs to run using the OS shell. - # đ https://git.io/JvXDl - - # âī¸ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language - - #- run: | - # make bootstrap - # make release + - name: Configure CMake && Build GpgFrontend + run: | + cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGPGFRONTEND_BUILD_TYPE_TEST_UI=ON + cmake --build ${{github.workspace}}/build --config {{$env.BUILD_TYPE}} -- -v - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml index 055347f0..8c140121 100644 --- a/.github/workflows/debug.yml +++ b/.github/workflows/debug.yml @@ -88,7 +88,7 @@ jobs: - name: Cache Qt id: cache-qt - uses: actions/cache@v1 + uses: actions/cache@v3 with: path: ../Qt key: ${{ runner.os }}-qt-cache-6 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d10dde2a..95d0f32a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -96,7 +96,7 @@ jobs: - name: Cache Qt (macOS) id: cache-qt-6 - uses: actions/cache@v1 + uses: actions/cache@v3 with: path: ../Qt key: ${{ runner.os }}-qt-cache-6 @@ -147,7 +147,7 @@ jobs: - name: Cache Qt id: cache-qt - uses: actions/cache@v1 + uses: actions/cache@v3 with: path: ../Qt key: ${{ runner.os }}-QtCache |