Skip to content

Commit

Permalink
CI macOS: swap version and arch position
Browse files Browse the repository at this point in the history
was UltraGrid-<arch>-<version>.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.
  • Loading branch information
MartinPulec committed May 21, 2024
1 parent 08b23e7 commit 111207a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/scripts/environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion data/MacOS-bundle-template/Contents/MacOS/update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 111207a

Please sign in to comment.