CI: Cleanup (#6677)

* Cleanup vcpkg matrix

* Add filename with extension as output

* fix name -> fullname, cleanup
This commit is contained in:
tooomm
2026-03-09 21:32:47 +01:00
committed by GitHub
parent 95d7e027fc
commit 42cec10457
2 changed files with 3 additions and 8 deletions

View File

@@ -46,3 +46,4 @@ relative_path="$path/$filename"
ls -l "$relative_path" ls -l "$relative_path"
echo "path=$relative_path" >>"$GITHUB_OUTPUT" echo "path=$relative_path" >>"$GITHUB_OUTPUT"
echo "name=$new_name" >>"$GITHUB_OUTPUT" echo "name=$new_name" >>"$GITHUB_OUTPUT"
echo "fullname=$filename" >>"$GITHUB_OUTPUT"

View File

@@ -225,7 +225,7 @@ jobs:
env: env:
GH_TOKEN: ${{github.token}} GH_TOKEN: ${{github.token}}
tag_name: ${{needs.configure.outputs.tag}} tag_name: ${{needs.configure.outputs.tag}}
asset_name: ${{steps.build.outputs.name}} asset_name: ${{steps.build.outputs.fullname}}
asset_path: ${{steps.build.outputs.path}} asset_path: ${{steps.build.outputs.path}}
run: gh release upload "$tag_name" "$asset_path#$asset_name" run: gh release upload "$tag_name" "$asset_path#$asset_name"
@@ -234,7 +234,6 @@ jobs:
if: steps.upload_release.outcome == 'success' if: steps.upload_release.outcome == 'success'
uses: actions/attest@v4 uses: actions/attest@v4
with: with:
subject-name: ${{steps.build.outputs.name}}
subject-path: ${{steps.build.outputs.path}} subject-path: ${{steps.build.outputs.path}}
show-summary: false show-summary: false
@@ -259,7 +258,6 @@ jobs:
override_target: 13 override_target: 13
make_package: 1 make_package: 1
package_suffix: "-macOS13_Intel" package_suffix: "-macOS13_Intel"
artifact_name: macOS13_Intel-package
qt_version: 6.10.* qt_version: 6.10.*
qt_arch: clang_64 qt_arch: clang_64
qt_modules: qtimageformats qtmultimedia qtwebsockets qt_modules: qtimageformats qtmultimedia qtwebsockets
@@ -274,7 +272,6 @@ jobs:
type: Release type: Release
make_package: 1 make_package: 1
package_suffix: "-macOS14" package_suffix: "-macOS14"
artifact_name: macOS14-package
qt_version: 6.10.* qt_version: 6.10.*
qt_arch: clang_64 qt_arch: clang_64
qt_modules: qtimageformats qtmultimedia qtwebsockets qt_modules: qtimageformats qtmultimedia qtwebsockets
@@ -289,7 +286,6 @@ jobs:
type: Release type: Release
make_package: 1 make_package: 1
package_suffix: "-macOS15" package_suffix: "-macOS15"
artifact_name: macOS15-package
qt_version: 6.10.* qt_version: 6.10.*
qt_arch: clang_64 qt_arch: clang_64
qt_modules: qtimageformats qtmultimedia qtwebsockets qt_modules: qtimageformats qtmultimedia qtwebsockets
@@ -314,7 +310,6 @@ jobs:
type: Release type: Release
make_package: 1 make_package: 1
package_suffix: "-Win10" package_suffix: "-Win10"
artifact_name: Windows10-installer
qt_version: 6.10.* qt_version: 6.10.*
qt_arch: win64_msvc2022_64 qt_arch: win64_msvc2022_64
qt_modules: qtimageformats qtmultimedia qtwebsockets qt_modules: qtimageformats qtmultimedia qtwebsockets
@@ -524,7 +519,7 @@ jobs:
env: env:
GH_TOKEN: ${{github.token}} GH_TOKEN: ${{github.token}}
tag_name: ${{needs.configure.outputs.tag}} tag_name: ${{needs.configure.outputs.tag}}
asset_name: ${{steps.build.outputs.name}} asset_name: ${{steps.build.outputs.fullname}}
asset_path: ${{steps.build.outputs.path}} asset_path: ${{steps.build.outputs.path}}
run: gh release upload "$tag_name" "$asset_path#$asset_name" run: gh release upload "$tag_name" "$asset_path#$asset_name"
@@ -533,7 +528,6 @@ jobs:
id: attestation id: attestation
uses: actions/attest@v4 uses: actions/attest@v4
with: with:
subject-name: ${{steps.build.outputs.name}}
subject-path: ${{steps.build.outputs.path}} subject-path: ${{steps.build.outputs.path}}
show-summary: false show-summary: false