From 111207abf19835016bcb0b447208faba6cb034f1 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Mon, 20 May 2024 09:02:30 +0200 Subject: [PATCH] CI macOS: swap version and arch position was UltraGrid--.dmg (eg. UltraGrid-arm64-1.9.2.dmg), which is not consistent with other platforms, eg. UltraGrid-1.9.2-x86_64.AppImage and UltraGrid-1.9.2-win64.zip. The one with the version just after UltraGrid seems to be more natural. --- .github/scripts/environment.sh | 2 +- data/MacOS-bundle-template/Contents/MacOS/update.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/scripts/environment.sh b/.github/scripts/environment.sh index af6d3cf18..1ae6a615c 100644 --- a/.github/scripts/environment.sh +++ b/.github/scripts/environment.sh @@ -20,7 +20,7 @@ fi # include platform on mac in version string if [ "$(uname -s)" = Darwin ]; then - VERSION="$(uname -m)-$VERSION" + VERSION="$VERSION-$(uname -m)" fi if [ -z "${CHANNEL-}" ]; then diff --git a/data/MacOS-bundle-template/Contents/MacOS/update.sh b/data/MacOS-bundle-template/Contents/MacOS/update.sh index 79278c9f0..e7162fa21 100755 --- a/data/MacOS-bundle-template/Contents/MacOS/update.sh +++ b/data/MacOS-bundle-template/Contents/MacOS/update.sh @@ -55,7 +55,7 @@ EOF if [ "$version" = master ]; then macos_ver_major=$(uname -r | cut -f 1 -d .) if [ "$macos_ver_major" -ge 21 ]; then - n=UltraGrid-$(uname -m)-continuous.dmg + n=UltraGrid-continuous-$(uname -m).dmg else n=UltraGrid-nightly-alt.dmg fi