feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

GitHub Actions: Fix tag release upload of artifacts

Browse Source 
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>
This commit is contained in:
Cristian Adam
2021-09-20 12:19:01 +02:00
parent 3c41665b80
commit b7ad67ccdf
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/build_cmake.yml vendored
View File

@@ -602,12 +602,10 @@ jobs:
config: config:
- { - {
name: "Windows Latest MSVC", artifact: "Windows-MSVC", name: "Windows Latest MSVC", artifact: "Windows-MSVC",
is_msvc: true,
os: ubuntu-latest os: ubuntu-latest
} }
- { - {
name: "Windows Latest MinGW", artifact: "Windows-MinGW", name: "Windows Latest MinGW", artifact: "Windows-MinGW",
is_msvc: false,
os: ubuntu-latest os: ubuntu-latest
} }
- { - {
@@ -634,21 +632,21 @@ jobs:
path: ./ path: ./
- name: Download wininterrupt artifact - name: Download wininterrupt artifact
if: runner.os == 'Windows' if: contains(matrix.config.artifact, 'Windows')
uses: actions/download-artifact@v1 uses: actions/download-artifact@v1
with: with:
name: wininterrupt-${{ matrix.config.artifact }}-${{ github.run_id }}.7z name: wininterrupt-${{ matrix.config.artifact }}-${{ github.run_id }}.7z
path: ./ path: ./
- name: Download qtcreatorcdbext artifact - name: Download qtcreatorcdbext artifact
if: runner.os == 'Windows' && matrix.config.is_msvc if: matrix.config.artifact == 'Windows-MSVC'
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
with: with:
name: qtcreatorcdbext-${{ matrix.config.artifact }}-${{ github.run_id }}.7z name: qtcreatorcdbext-${{ matrix.config.artifact }}-${{ github.run_id }}.7z
path: ./ path: ./
- name: Download disk image artifact - name: Download disk image artifact
if: runner.os == 'macOS' if: matrix.config.artifact == 'macOS'
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
with: with:
name: qt-creator-${{ matrix.config.artifact }}-${{ github.run_id }}.dmg name: qt-creator-${{ matrix.config.artifact }}-${{ github.run_id }}.dmg
@@ -685,7 +683,7 @@ jobs:
asset_content_type: application/x-gtar asset_content_type: application/x-gtar
- name: Upload wininterrupt to Release - name: Upload wininterrupt to Release
if: runner.os == 'Windows' if: contains(matrix.config.artifact, 'Windows')
uses: actions/upload-release-asset@v1.0.1 uses: actions/upload-release-asset@v1.0.1
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -696,7 +694,7 @@ jobs:
asset_content_type: application/x-gtar asset_content_type: application/x-gtar
- name: Upload qtcreatorcdbext to Release - 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 uses: actions/upload-release-asset@v1.0.1
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -707,7 +705,7 @@ jobs:
asset_content_type: application/x-gtar asset_content_type: application/x-gtar
- name: Upload disk image to Release - name: Upload disk image to Release
if: runner.os == 'macOS' if: matrix.config.artifact == 'macOS'
uses: actions/upload-release-asset@v1.0.1 uses: actions/upload-release-asset@v1.0.1
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}