diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2021-09-20 12:19:01 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2021-09-20 12:48:36 +0000 |
| commit | b7ad67ccdf077d5890715a9c52883accaf786a17 (patch) | |
| tree | 7ba483de11c49ab2cea3edf4e9ba227552c0ee98 /.github | |
| parent | 3c41665b809dce6cf5b0d469ba41c40e58b67475 (diff) | |
| download | qt-creator-b7ad67ccdf077d5890715a9c52883accaf786a17.tar.gz | |
GitHub Actions: Fix tag release upload of artifacts
runner.os for uploading of artifacts is always ubuntu, and therefore
the runner.os comparisons were not working as expected.
Change-Id: I9e2bb418d4fee47aaf57a096a23cbd554051d1df
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build_cmake.yml | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index d9408a9825..ca71ec446f 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -602,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 } - { @@ -634,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 @@ -685,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 }} @@ -696,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 }} @@ -707,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 }} |