diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-09-22 13:31:25 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-09-22 13:31:25 +0200 |
| commit | 6a02aa257428b0288f1af2df7fd3aaf0016764fb (patch) | |
| tree | a15583ff21247fd0d683e2c0e78bb261d47c5434 /.github | |
| parent | 091f1571920407035574341b508e27f636b59b0c (diff) | |
| parent | 11fd8232b790e8a24070709e046a55b44fbb2fc2 (diff) | |
| download | qt-creator-6a02aa257428b0288f1af2df7fd3aaf0016764fb.tar.gz | |
Merge remote-tracking branch 'origin/5.0'
Change-Id: I75aab10a066ce0e2d322663db7723825043fa9c8
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build_cmake.yml | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index d9d45eefb1..1971d93c73 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -455,6 +455,11 @@ jobs: find_package(Python3 REQUIRED COMPONENTS Interpreter) string(REPLACE "x86" "x64" Python3_EXECUTABLE "${Python3_EXECUTABLE}") + set(WITH_TESTS "--with-tests") + if (${{github.ref}} MATCHES "tags/v") + unset(WITH_TESTS) + endif() + execute_process( COMMAND python -u @@ -465,7 +470,7 @@ jobs: --qt-path "${{ steps.qt.outputs.qt_dir }}" --llvm-path "${{ steps.libclang.outputs.libclang_dir }}" --python3 "${Python3_EXECUTABLE}" - --with-tests + ${WITH_TESTS} ${CDB_OPTION} ${ELFUTILS_OPTION} --add-config=-DCMAKE_C_COMPILER_LAUNCHER=ccache @@ -597,12 +602,10 @@ jobs: config: - { name: "Windows Latest MSVC", artifact: "Windows-MSVC", - is_msvc: true, os: ubuntu-latest } - { name: "Windows Latest MinGW", artifact: "Windows-MinGW", - is_msvc: false, os: ubuntu-latest } - { @@ -629,21 +632,21 @@ jobs: path: ./ - name: Download wininterrupt artifact - if: runner.os == 'Windows' + if: contains(matrix.config.artifact, 'Windows') uses: actions/download-artifact@v1 with: name: wininterrupt-${{ matrix.config.artifact }}-${{ github.run_id }}.7z path: ./ - name: Download qtcreatorcdbext artifact - if: runner.os == 'Windows' && matrix.config.is_msvc + if: matrix.config.artifact == 'Windows-MSVC' uses: actions/upload-artifact@v1 with: name: qtcreatorcdbext-${{ matrix.config.artifact }}-${{ github.run_id }}.7z path: ./ - name: Download disk image artifact - if: runner.os == 'macOS' + if: matrix.config.artifact == 'macOS' uses: actions/upload-artifact@v1 with: name: qt-creator-${{ matrix.config.artifact }}-${{ github.run_id }}.dmg @@ -680,7 +683,7 @@ jobs: asset_content_type: application/x-gtar - name: Upload wininterrupt to Release - if: runner.os == 'Windows' + if: contains(matrix.config.artifact, 'Windows') uses: actions/upload-release-asset@v1.0.1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -691,7 +694,7 @@ jobs: asset_content_type: application/x-gtar - name: Upload qtcreatorcdbext to Release - if: runner.os == 'Windows' && matrix.config.is_msvc + if: matrix.config.artifact == 'Windows-MSVC' uses: actions/upload-release-asset@v1.0.1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -702,7 +705,7 @@ jobs: asset_content_type: application/x-gtar - name: Upload disk image to Release - if: runner.os == 'macOS' + if: matrix.config.artifact == 'macOS' uses: actions/upload-release-asset@v1.0.1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} |