Fix macOS artifact names and fix jq quotes issue

This commit is contained in:
Joseph Donofry 2023-02-28 16:16:24 -05:00
parent 40ab6f5ce9
commit 7a8bfe4940
No known key found for this signature in database
GPG key ID: E8A1D78EF044B0CB
3 changed files with 4 additions and 4 deletions

View file

@ -97,7 +97,7 @@ done
VERSION=${CI_COMMIT_SHORT_SHA} VERSION=${CI_COMMIT_SHORT_SHA}
if [ -n "$VERSION" ]; then if [ -n "$VERSION" ]; then
mv nheko.dmg "nheko-${VERSION}_${PLAT}.dmg" mv nheko.dmg "nheko-${VERSION}-${PLAT}.dmg"
mkdir -p artifacts mkdir -p artifacts
cp "nheko-${VERSION}_${PLAT}.dmg" artifacts/ cp "nheko-${VERSION}-${PLAT}.dmg" artifacts/
fi fi

View file

@ -43,7 +43,7 @@ elif [ "$http_code" = "200" ]; then
fi fi
echo "Getting upload URL..." 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 # get rid of the 'hypermedia' stuff at the end and use a 'real' URL
echo "Upload URL (hypermedia): ${upload_url}" echo "Upload URL (hypermedia): ${upload_url}"
upload_url="$(echo "$upload_url" | sed 's/{?name,label\}/?name/g')" upload_url="$(echo "$upload_url" | sed 's/{?name,label\}/?name/g')"

View file

@ -151,7 +151,7 @@ codesign-macos:
- export PATH=/usr/local/opt/qt@5/bin/:${PATH} - export PATH=/usr/local/opt/qt@5/bin/:${PATH}
- ./.ci/macos/notarize.sh - ./.ci/macos/notarize.sh
after_script: 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: needs:
- job: build-macos - job: build-macos
optional: true # optional since we want to be able to also trigger this job from cirrus ci for apple silicon builds. optional: true # optional since we want to be able to also trigger this job from cirrus ci for apple silicon builds.