forked from qt-creator/qt-creator
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>
This commit is contained in:
14
.github/workflows/build_cmake.yml
vendored
14
.github/workflows/build_cmake.yml
vendored
@@ -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 }}
|
||||
|
Reference in New Issue
Block a user