Merge remote-tracking branch 'origin/canarymention' into canarymention

Changed headless from .app.tar to .tar just so it's what it was before
Idk if this broke or fixed anything but
2025-01-05 02:27:21 +01:00 · 2024-11-21 17:41:35 +01:00 · 2024-11-21 17:41:04 +01:00
2 changed files with 4 additions and 5 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -8,7 +8,6 @@ env:
  DOTNET_CLI_TELEMETRY_OPTOUT: 1
  RYUJINX_BASE_VERSION: "1.2.0"
  RELEASE: 0
-  CANARY: 0

 jobs:
  build:
--- a/distribution/macos/create_macos_build_headless.sh
+++ b/distribution/macos/create_macos_build_headless.sh
@ -21,11 +21,11 @@ CONFIGURATION=$7
 CANARY=$8

 if [ "$CANARY" == "1" ]; then
-  RELEASE_TAR_FILE_NAME=nogui-ryujinx-canary-$VERSION-macos_universal.app.tar
+  RELEASE_TAR_FILE_NAME=nogui-ryujinx-canary-$VERSION-macos_universal.tar
 elif [ "$VERSION" == "1.1.0" ]; then
-  RELEASE_TAR_FILE_NAME=nogui-ryujinx-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.app.tar
+  RELEASE_TAR_FILE_NAME=nogui-ryujinx-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.tar
 else
-  RELEASE_TAR_FILE_NAME=nogui-ryujinx-$VERSION-macos_universal.app.tar
+  RELEASE_TAR_FILE_NAME=nogui-ryujinx-$VERSION-macos_universal.tar
 fi

 ARM64_OUTPUT="$TEMP_DIRECTORY/publish_arm64"
@ -57,7 +57,7 @@ mkdir -p "$OUTPUT_DIRECTORY"
 cp -R "$ARM64_OUTPUT/" "$UNIVERSAL_OUTPUT"
 rm "$UNIVERSAL_OUTPUT/$EXECUTABLE_SUB_PATH"

-# Make it libraries universal
+# Make its libraries universal
 python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_OUTPUT" "$X64_OUTPUT" "$UNIVERSAL_OUTPUT" "**/*.dylib"

 if ! [ -x "$(command -v lipo)" ];
Author	SHA1	Message	Date
GabCoolGuy	0757b346c8	Merge remote-tracking branch 'origin/canarymention' into canarymention	2024-11-21 17:41:35 +01:00
GabCoolGuy	7db165db31	Changed headless from .app.tar to .tar just so it's what it was before Idk if this broke or fixed anything but	2024-11-21 17:41:04 +01:00