Skip to content

Commit dd5f2a6

Browse files
committed
make upload targets unique per run
1 parent eb567e9 commit dd5f2a6

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

.github/workflows/ci-cmake.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
os: ubuntu-22.04
3737
platform: linux
3838
config-flags: -DCMAKE_BUILD_TYPE=Release
39-
artifact-name: godot-cpp-linux-glibc2.27-x86_64-release.cmake
39+
artifact-name: godot-cpp-linux-glibc2.27-x86_64-cmake-release
4040
artifact-path: cmake-build/bin/libgodot-cpp.linux.template_release.x86_64.a
4141
run-tests: true
4242
godot-test-arch: "linux.x86_64"
@@ -50,7 +50,7 @@ jobs:
5050
config-flags:
5151
-DCMAKE_BUILD_TYPE=Release
5252
-DGODOTCPP_API_VERSION=4.6
53-
artifact-name: godot-cpp-linux-glibc2.27-x86_64-release.cmake
53+
artifact-name: godot-cpp-linux-glibc2.27-x86_64-cmake-release-godot46
5454
artifact-path: cmake-build/bin/libgodot-cpp.linux.template_release.x86_64.a
5555
run-tests: true
5656
godot-test-versions: "4.6-stable"
@@ -63,7 +63,7 @@ jobs:
6363
platform: windows
6464
compiler: msvc
6565
build-flags: --config Release
66-
artifact-name: godot-cpp-windows-msvc2019-x86_64-release.cmake
66+
artifact-name: godot-cpp-windows-msvc2022-x86_64-cmake-release
6767
artifact-path: cmake-build/bin/libgodot-cpp.windows.template_release.x86_64.lib
6868
run-tests: true
6969
godot-test-arch: "win64.exe"
@@ -77,7 +77,7 @@ jobs:
7777
config-flags:
7878
-GNinja -DCMAKE_BUILD_TYPE=Release
7979
-DCMAKE_C_COMPILER=cc -DCMAKE_CXX_COMPILER=c++
80-
artifact-name: godot-cpp-linux-mingw-x86_64-release.cmake
80+
artifact-name: godot-cpp-windows-mingw-x86_64-cmake-release
8181
artifact-path: cmake-build/bin/libgodot-cpp.windows.template_release.x86_64.a
8282
run-tests: true
8383
godot-test-arch: "win64.exe"
@@ -88,7 +88,7 @@ jobs:
8888
os: macos-latest
8989
platform: macos
9090
config-flags: -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64"
91-
artifact-name: godot-cpp-macos-universal-release.cmake
91+
artifact-name: godot-cpp-macos-universal-cmake-release
9292
artifact-path: cmake-build/bin/libgodot-cpp.macos.template_release.universal.a
9393
run-tests: true
9494
godot-test-arch: "macos.universal"
@@ -102,7 +102,7 @@ jobs:
102102
-G Ninja -DCMAKE_BUILD_TYPE=Release
103103
--toolchain ${ANDROID_HOME}/ndk/28.1.13356709/build/cmake/android.toolchain.cmake
104104
-DANDROID_PLATFORM=24 -DANDROID_ABI=arm64-v8a
105-
artifact-name: godot-cpp-android-arm64-release.cmake
105+
artifact-name: godot-cpp-android-arm64-cmake-release
106106
artifact-path: cmake-build/bin/libgodot-cpp.android.template_release.arm64.a
107107
flags: arch=arm64
108108
run-tests: false
@@ -115,7 +115,7 @@ jobs:
115115
--toolchain cmake/ios.toolchain.cmake
116116
-DPLATFORM=OS64
117117
build-flags: --config Release
118-
artifact-name: godot-cpp-ios-arm64-release.cmake
118+
artifact-name: godot-cpp-ios-arm64-cmake-release
119119
artifact-path: cmake-build/bin/libgodot-cpp.ios.template_release.arm64.a
120120
flags: arch=arm64
121121
run-tests: false
@@ -126,13 +126,13 @@ jobs:
126126
config-flags:
127127
-G Ninja -DCMAKE_BUILD_TYPE=Release
128128
--toolchain ${EMSDK}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake
129-
artifact-name: godot-cpp-web-wasm32-release.cmake
129+
artifact-name: godot-cpp-web-wasm32-cmake-release
130130
artifact-path: cmake-build/bin/libgodot-cpp.web.template_release.wasm32.a
131131
run-tests: false
132132

133133
steps:
134134
- name: Checkout
135-
uses: actions/checkout@v4
135+
uses: actions/checkout@v5
136136
with:
137137
submodules: recursive
138138

@@ -191,14 +191,14 @@ jobs:
191191

192192
- name: Upload test metrics
193193
if: matrix.run-tests
194-
uses: actions/upload-artifact@v4
194+
uses: actions/upload-artifact@v7
195195
with:
196196
name: test-metrics-${{ matrix.name }}
197197
path: test/test-metrics.json
198198
if-no-files-found: ignore
199199

200200
- name: Upload artifact
201-
uses: actions/upload-artifact@v4
201+
uses: actions/upload-artifact@v7
202202
with:
203203
name: ${{ matrix.artifact-name }}
204204
path: ${{ matrix.artifact-path }}
@@ -213,12 +213,12 @@ jobs:
213213
echo
214214
echo "| Metric | Value |"
215215
echo "|--------|-------|"
216-
"${SCCACHE_PATH}" --show-stats | awk '
216+
"${SCCACHE_PATH}" --show-stats 2>/dev/null | awk '
217217
/^[A-Za-z]/ {
218218
gsub(/^[ \t]+|[ \t]+$/, "");
219219
gsub(/[ \t]{2,}/, "|");
220220
print "| " $0 " |";
221221
}
222222
'
223-
} >> "$GITHUB_STEP_SUMMARY"
223+
} >> "$GITHUB_STEP_SUMMARY" || true
224224
"${SCCACHE_PATH}" --stop-server || true

0 commit comments

Comments
 (0)