Fix macOS artifact names and fix jq quotes issue
3 files changed, 4 insertions, 4 deletions
diff --git a/.ci/macos/notarize.sh b/.ci/macos/notarize.sh
index cb3d3ef7..345f4828 100755
--- a/.ci/macos/notarize.sh
+++ b/.ci/macos/notarize.sh
@@ -97,7 +97,7 @@ done
VERSION=${CI_COMMIT_SHORT_SHA}
if [ -n "$VERSION" ]; then
- mv nheko.dmg "nheko-${VERSION}_${PLAT}.dmg"
+ mv nheko.dmg "nheko-${VERSION}-${PLAT}.dmg"
mkdir -p artifacts
- cp "nheko-${VERSION}_${PLAT}.dmg" artifacts/
+ cp "nheko-${VERSION}-${PLAT}.dmg" artifacts/
fi
\ No newline at end of file
diff --git a/.ci/update-github-release.sh b/.ci/update-github-release.sh
index ac643987..234c1f41 100755
--- a/.ci/update-github-release.sh
+++ b/.ci/update-github-release.sh
@@ -43,7 +43,7 @@ elif [ "$http_code" = "200" ]; then
fi
echo "Getting upload URL..."
-upload_url="$(echo "$release_json" | jq '."upload_url"')"
+upload_url="$(echo "$release_json" | jq -r '."upload_url"')"
# get rid of the 'hypermedia' stuff at the end and use a 'real' URL
echo "Upload URL (hypermedia): ${upload_url}"
upload_url="$(echo "$upload_url" | sed 's/{?name,label\}/?name/g')"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 92e11338..460d9c9c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -151,7 +151,7 @@ codesign-macos:
- export PATH=/usr/local/opt/qt@5/bin/:${PATH}
- ./.ci/macos/notarize.sh
after_script:
- - ./.ci/upload-nightly-gitlab.sh artifacts/nheko-${CI_COMMIT_SHORT_SHA}_${PLAT}.dmg
+ - ./.ci/upload-nightly-gitlab.sh artifacts/nheko-${CI_COMMIT_SHORT_SHA}-${PLAT}.dmg
needs:
- job: build-macos
optional: true # optional since we want to be able to also trigger this job from cirrus ci for apple silicon builds.
|
