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
2024-11-21 17:41:35 +01:00 · 2024-11-21 17:41:04 +01:00 · 2024-11-21 17:26:25 +01:00 · 2024-11-21 17:25:22 +01:00 · 2024-11-21 10:16:13 -06:00 · 2024-11-21 17:14:13 +01:00
6 changed files with 5 additions and 9 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/.github/workflows/canary.yml
+++ b/.github/workflows/canary.yml
@@ -25,7 +25,6 @@ env:
  RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO: "Ryujinx"
  RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx-Canary"
  RELEASE: 1
-  CANARY: 1

 jobs:
  tag:
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,7 +24,6 @@ env:
  RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "GreemDev"
  RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx"
  RELEASE: 1
-  CANARY: 0

 jobs:
  tag:
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@
  Guides and documentation can be found on the <a href="https://github.com/GreemDev/Ryujinx/wiki">Wiki tab</a>.
 </p>
 <p align="center">
-  If you would like a version more preservative fork of Ryujinx, check out <a href="https://github.com/ryujinx-mirror/ryujinx">ryujinx-mirror</a>.
+  If you would like a more preservative fork of Ryujinx, check out <a href="https://github.com/ryujinx-mirror/ryujinx">ryujinx-mirror</a>.
 </p>

 <p align="center">
--- 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)" ];
--- a/src/Ryujinx.Common/Logging/Targets/FileLogTarget.cs
+++ b/src/Ryujinx.Common/Logging/Targets/FileLogTarget.cs
@@ -2,7 +2,6 @@ using Ryujinx.Common.Logging.Formatters;
 using System;
 using System.IO;
 using System.Linq;
-using System.Net.Mime;

 namespace Ryujinx.Common.Logging.Targets
 {
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
GabCoolGuy	75d7214288	Merge branch 'master' into canarymention	2024-11-21 17:26:25 +01:00
GabCoolGuy	953f997b53	Remove accidental using	2024-11-21 17:25:22 +01:00
Evan Husted	c2de5cc700	Fix really obvious typo, lol	2024-11-21 10:16:13 -06:00
GabCoolGuy	392c97208b	Remove left-over env variable	2024-11-21 17:14:13 +01:00