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 17:14:13 +01:00 · 2024-11-21 16:31:44 +01:00
6 changed files with 25 additions and 22 deletions
--- a/.github/workflows/canary.yml
+++ b/.github/workflows/canary.yml
@@ -111,12 +111,12 @@ jobs:
        run: |
          pushd publish_ava
          rm publish/libarmeilleure-jitsupport.dylib
-          7z a ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
+          7z a ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
          popd

          pushd publish_sdl2_headless
          rm publish/libarmeilleure-jitsupport.dylib
-          7z a ../release_output/nogui-ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
+          7z a ../release_output/nogui-ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
          popd
        shell: bash

@@ -126,13 +126,13 @@ jobs:
          pushd publish_ava
          rm publish/libarmeilleure-jitsupport.dylib
          chmod +x publish/Ryujinx.sh publish/Ryujinx
-          tar -czvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
+          tar -czvf ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
          popd

          pushd publish_sdl2_headless
          rm publish/libarmeilleure-jitsupport.dylib
          chmod +x publish/Ryujinx.sh publish/Ryujinx.Headless.SDL2
-          tar -czvf ../release_output/nogui-ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
+          tar -czvf ../release_output/nogui-ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
          popd
        shell: bash
      
@@ -236,11 +236,11 @@ jobs:

      - name: Publish macOS Ryujinx
        run: |
-          ./distribution/macos/create_macos_build_ava.sh . publish_tmp_ava publish_ava ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release
+          ./distribution/macos/create_macos_build_ava.sh . publish_tmp_ava publish_ava ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 1

      - name: Publish macOS Ryujinx.Headless.SDL2
        run: |
-          ./distribution/macos/create_macos_build_headless.sh . publish_tmp_headless publish_headless ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release
+          ./distribution/macos/create_macos_build_headless.sh . publish_tmp_headless publish_headless ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 1

      - name: Pushing new release
        uses: ncipollo/release-action@v1
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -231,11 +231,11 @@ jobs:

      - name: Publish macOS Ryujinx
        run: |
-          ./distribution/macos/create_macos_build_ava.sh . publish_tmp_ava publish ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release
+          ./distribution/macos/create_macos_build_ava.sh . publish_tmp_ava publish ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 0

      - name: Publish macOS Ryujinx.Headless.SDL2
        run: |
-          ./distribution/macos/create_macos_build_headless.sh . publish_tmp_headless publish_headless ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release
+          ./distribution/macos/create_macos_build_headless.sh . publish_tmp_headless publish_headless ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 0

      - name: Pushing new release
        uses: ncipollo/release-action@v1
--- a/distribution/macos/create_macos_build_ava.sh
+++ b/distribution/macos/create_macos_build_ava.sh
@@ -2,8 +2,8 @@

 set -e

-if [ "$#" -lt 7 ]; then
-    echo "usage <BASE_DIR> <TEMP_DIRECTORY> <OUTPUT_DIRECTORY> <ENTITLEMENTS_FILE_PATH> <VERSION> <SOURCE_REVISION_ID> <CONFIGURATION> <EXTRA_ARGS>"
+if [ "$#" -lt 8 ]; then
+    echo "usage <BASE_DIR> <TEMP_DIRECTORY> <OUTPUT_DIRECTORY> <ENTITLEMENTS_FILE_PATH> <VERSION> <SOURCE_REVISION_ID> <CONFIGURATION> <CANARY>"
    exit 1
 fi

@@ -18,10 +18,11 @@ ENTITLEMENTS_FILE_PATH=$(readlink -f "$4")
 VERSION=$5
 SOURCE_REVISION_ID=$6
 CONFIGURATION=$7
-EXTRA_ARGS=$8
+CANARY=$8

-if [ "$VERSION" == "1.1.0" ];
-then
+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
  RELEASE_TAR_FILE_NAME=ryujinx-$VERSION-macos_universal.app.tar
@@ -61,7 +62,7 @@ mkdir -p "$OUTPUT_DIRECTORY"
 cp -R "$ARM64_APP_BUNDLE" "$UNIVERSAL_APP_BUNDLE"
 rm "$UNIVERSAL_APP_BUNDLE/$EXECUTABLE_SUB_PATH"

-# Make it libraries universal
+# Make its libraries universal
 python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_APP_BUNDLE" "$X64_APP_BUNDLE" "$UNIVERSAL_APP_BUNDLE" "**/*.dylib"

 if ! [ -x "$(command -v lipo)" ];
--- a/distribution/macos/create_macos_build_headless.sh
+++ b/distribution/macos/create_macos_build_headless.sh
@@ -2,8 +2,8 @@

 set -e

-if [ "$#" -lt 7 ]; then
-    echo "usage <BASE_DIR> <TEMP_DIRECTORY> <OUTPUT_DIRECTORY> <ENTITLEMENTS_FILE_PATH> <VERSION> <SOURCE_REVISION_ID> <CONFIGURATION> <EXTRA_ARGS>"
+if [ "$#" -lt 8 ]; then
+    echo "usage <BASE_DIR> <TEMP_DIRECTORY> <OUTPUT_DIRECTORY> <ENTITLEMENTS_FILE_PATH> <VERSION> <SOURCE_REVISION_ID> <CONFIGURATION> <CANARY>"
    exit 1
 fi

@@ -18,10 +18,11 @@ ENTITLEMENTS_FILE_PATH=$(readlink -f "$4")
 VERSION=$5
 SOURCE_REVISION_ID=$6
 CONFIGURATION=$7
-EXTRA_ARGS=$8
+CANARY=$8

-if [ "$VERSION" == "1.1.0" ];
-then
+if [ "$CANARY" == "1" ]; then
+  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.tar
 else
  RELEASE_TAR_FILE_NAME=nogui-ryujinx-$VERSION-macos_universal.tar
@@ -56,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
@@ -69,9 +69,10 @@ namespace Ryujinx.Common.Logging.Targets
            }

            string version = ReleaseInformation.Version;
+            string appName = ReleaseInformation.IsCanaryBuild ? "Ryujinx_Canary" : "Ryujinx";

            // Get path for the current time
-            path = Path.Combine(logDir.FullName, $"Ryujinx_{version}_{DateTime.Now:yyyy-MM-dd_HH-mm-ss}.log");
+            path = Path.Combine(logDir.FullName, $"{appName}_{version}_{DateTime.Now:yyyy-MM-dd_HH-mm-ss}.log");

            try
            {
--- a/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs
@@ -49,7 +49,7 @@ namespace Ryujinx.Ava.UI.ViewModels

        public AboutWindowViewModel()
        {
-            Version = Program.Version;
+            Version = App.FullAppName + "\n" + Program.Version;
            UpdateLogoTheme(ConfigurationState.Instance.UI.BaseStyle.Value);

            ThemeManager.ThemeChanged += ThemeManager_ThemeChanged;
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
GabCoolGuy	392c97208b	Remove left-over env variable	2024-11-21 17:14:13 +01:00
GabCoolGuy	809d2680f7	Remove left over canary bash files and fixed headless name artifacts for macos	2024-11-21 16:31:44 +01:00
GabCoolGuy	1323b52091	Final cleanup	2024-11-21 16:17:12 +01:00
GabCoolGuy	9e2f3816da	added missing canary argument to launch options for macos	2024-11-21 16:03:23 +01:00
GabCoolGuy	e694afe74e	maybe i should stop naming my commits like this but im tired	2024-11-21 15:04:30 +01:00
GabCoolGuy	fa64ce7510	aaaaa	2024-11-21 14:58:28 +01:00
GabCoolGuy	a7e34045eb	i'm tired boss	2024-11-21 14:51:47 +01:00
GabCoolGuy	272197bca7	please for the love of capybaras	2024-11-21 14:23:37 +01:00
GabCoolGuy	dfff0a1c58	AAAAAAAAAAA	2024-11-21 13:01:04 +01:00
GabCoolGuy	58cfffd14d	HOPEFULLY I DID THIS RIGHT i think i added the canary variable	2024-11-21 12:58:33 +01:00
GabCoolGuy	1f694aa424	ubjkb	2024-11-21 12:31:55 +01:00
GabCoolGuy	fd8df4f64f	oops	2024-11-21 09:27:49 +01:00
GabCoolGuy	467c3d0fba	Print canary var to try and see what's wrong	2024-11-21 09:25:16 +01:00
GabCoolGuy	de1d29eb94	Replace `&&` op with `\|\|` to hopefully fix macos artifacts's names, also hopefully fixed headless macos artifacts just not getting published	2024-11-21 08:22:11 +01:00
GabCoolGuy	3a1c884bec	Fix faulty if statement formatting This should make it so that macos builds compile like intended	2024-11-21 08:08:24 +01:00
GabCoolGuy	20644368af	Merge remote-tracking branch 'origin/canarymention' into canarymention # Conflicts: # distribution/macos/create_macos_build_ava.sh # distribution/macos/create_macos_build_headless.sh	2024-11-20 22:18:44 +01:00
GabCoolGuy	c3631dc263	attempt 2 fixed bad syntax	2024-11-20 22:17:42 +01:00
GabCoolGuy	77fc9348b9	Attempt to check if canary in `create_macos_build_ava.sh` and in `create_macos_build_ava_headless.sh` instead of in seperate files This helps keeping things concise and should maybe work well idk	2024-11-20 22:12:57 +01:00
GabCoolGuy	f6d4580155	Attempt to check if canary in `create_macos_build_ava.sh` and in `create_macos_build_ava_headless.sh` instead of in seperate files This helps keeping things concise and should maybe work well idk	2024-11-20 22:11:05 +01:00
GabCoolGuy	fbd9a441fb	zfaazfqsf	2024-11-20 20:06:57 +01:00
GabCoolGuy	a241dc4b8a	Merge branch 'master' into canarymention	2024-11-20 20:04:03 +01:00
GabCoolGuy	294507a2e4	Merge remote-tracking branch 'origin/canarymention' into canarymention	2024-11-20 20:03:22 +01:00
GabCoolGuy	8cbcf15d0a	Change headless to nogui	2024-11-20 20:02:53 +01:00
Evan Husted	82cf5c8e95	Merge branch 'master' into canarymention	2024-11-19 08:29:55 -06:00
GabCoolGuy	ef78e1bf19	Merge remote-tracking branch 'origin/canarymention' into canarymention	2024-11-17 11:54:04 +01:00
GabCoolGuy	8dd78b4fb7	Changed `Ryujinx Canary` to `Ryujinx_Canary` to follow nearby formatting in FileLogTarget.cs	2024-11-17 11:53:32 +01:00
GabCoolGuy	2c9e59365d	Merge branch 'GreemDev:master' into canarymention	2024-11-17 10:09:08 +01:00
GabCoolGuy	eba93a3d66	Attempt to fix macos canary workflows	2024-11-17 01:35:28 +01:00
GabCoolGuy	75a4403cf1	Added canary in canary logs	2024-11-17 01:04:43 +01:00
GabCoolGuy	e47487902e	Added more mentions of canary Changed github workflows to have "canary" in the zip files Added `App.FullAppName` in the about section, so that it's clear in there too	2024-11-17 00:36:21 +01:00