From 1323b520918944627d716c6e4b01f4c9e03db54f Mon Sep 17 00:00:00 2001 From: GabCoolGuy Date: Thu, 21 Nov 2024 16:17:12 +0100 Subject: [PATCH] Final cleanup --- .github/workflows/canary.yml | 2 +- .github/workflows/release.yml | 2 +- distribution/macos/create_macos_build_ava.sh | 6 ++---- distribution/macos/create_macos_build_headless.sh | 4 +--- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index 87aafba7b..ed23eceb3 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -21,7 +21,7 @@ env: DOTNET_CLI_TELEMETRY_OPTOUT: 1 RYUJINX_BASE_VERSION: "1.2" RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "canary" - RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "GabCoolDude" + RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "GreemDev" RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO: "Ryujinx" RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx-Canary" RELEASE: 1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 06da034dd..ee6755c94 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,7 @@ env: DOTNET_CLI_TELEMETRY_OPTOUT: 1 RYUJINX_BASE_VERSION: "1.2" RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "release" - RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "GabCoolDude" + RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "GreemDev" RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx" RELEASE: 1 CANARY: 0 diff --git a/distribution/macos/create_macos_build_ava.sh b/distribution/macos/create_macos_build_ava.sh index 51985f26f..b19fa4863 100755 --- a/distribution/macos/create_macos_build_ava.sh +++ b/distribution/macos/create_macos_build_ava.sh @@ -20,10 +20,8 @@ SOURCE_REVISION_ID=$6 CONFIGURATION=$7 CANARY=$8 -printf "Canary var: %s" "$CANARY \n" - -if [ "$VERSION" == "1.1.0" ] || [ "$CANARY" == "1" ]; then - RELEASE_TAR_FILE_NAME=ryujinx-canary-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.app.tar +if [ "$CANARY" == "1" ]; then + RELEASE_TAR_FILE_NAME=ryujinx-canary-$VERSION-macos_universal.app.tar elif [ "$VERSION" == "1.1.0" ]; then RELEASE_TAR_FILE_NAME=ryujinx-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.app.tar else diff --git a/distribution/macos/create_macos_build_headless.sh b/distribution/macos/create_macos_build_headless.sh index ac7aa03d2..61efed6f0 100755 --- a/distribution/macos/create_macos_build_headless.sh +++ b/distribution/macos/create_macos_build_headless.sh @@ -20,9 +20,7 @@ SOURCE_REVISION_ID=$6 CONFIGURATION=$7 CANARY=$8 -printf "Canary var: %s" "$CANARY \n" - -if [ "$VERSION" == "1.1.0" ] || [ "$CANARY" == "1" ]; then +if [ "$CANARY" == "1" ]; then RELEASE_TAR_FILE_NAME=nogui-ryujinx-canary-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.app.tar elif [ "$VERSION" == "1.1.0" ]; then RELEASE_TAR_FILE_NAME=nogui-ryujinx-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.app.tar