diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2023-03-06 11:08:16 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2023-03-06 11:08:16 +0100 |
| commit | 4699ba7bb95c9460a2aa33b7440386092cf2b71f (patch) | |
| tree | 1579140842fb08a72df78624c33f5c41ea35f75a /.github | |
| parent | 3777fd78d220c8e8557d19d168b297da23c5cb51 (diff) | |
| parent | 1a6cfb0af220926f8b00219c5dd7feb36bcaa0d2 (diff) | |
| download | qbs-4699ba7bb95c9460a2aa33b7440386092cf2b71f.tar.gz | |
Merge 2.0 into master
Change-Id: If8cf6ccf0bb3bc57f8589d5b742a26a6c85dbc1c
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/release.yml | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c600845d1..ea8c401ff 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -154,8 +154,7 @@ jobs: modules.qbsbuildconfig.enableUnitTests:false modules.cpp.treatWarningsAsErrors:true project.withDocumentation:true - config:release-64 profile:qt64 - config:release profile:qt + config:release profile:qt64 - name: Print clcache stats run: docker-compose run --rm windows clcache -s - name: Get archive name @@ -169,7 +168,6 @@ jobs: path: | release/qbs.*.nupkg release/qbs-windows-*.zip - release-64/qbs-windows-*.zip create-archives: name: Create Archives @@ -211,12 +209,11 @@ jobs: uses: actions/download-artifact@v1 with: name: qbs-windows-${{ github.run_id }} - path: ./tmp + path: ./tmp/release - name: Copy Windows artifacts run: | cp ./tmp/release/qbs.*.nupkg ./release - cp ./tmp/release/qbs-windows-x86-*.zip ./release - cp ./tmp/release-64/qbs-windows-x86_64-*.zip ./release + cp ./tmp/release/qbs-windows-x86_64-*.zip ./release - name: Copy changelog run: cp changelogs/changes-${{ steps.get-version-name.outputs.version-name }}.md release || echo "changelog not found" - name: Generate checksums @@ -236,7 +233,6 @@ jobs: release/qbs-src-*.tar.gz release/qbs-linux-*.tar.gz release/qbs.*.nupkg - release/qbs-windows-x86-*.zip release/qbs-windows-x86_64-*.zip release/changes-*.md release/md5sums.txt |