From aa227ae9c4b6ae5361d68ef7804bd314805e8a2c Mon Sep 17 00:00:00 2001 From: GabCoolDude Date: Sun, 12 Jan 2025 21:01:11 +0100 Subject: [PATCH 1/5] Use LLVM 19 to try and fix macos builds not working:tm: --- .github/workflows/canary.yml | 6 +++--- distribution/macos/create_macos_build_ava.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index b352e82d7..baf8815a7 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: "GreemDev" + RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "GabCoolDude" RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO: "Ryujinx" RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx-Canary" RELEASE: 1 @@ -223,11 +223,11 @@ jobs: with: global-json-file: global.json - - name: Setup LLVM 15 + - name: Setup LLVM 17 run: | wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh - sudo ./llvm.sh 15 + sudo ./llvm.sh 17 - name: Install rcodesign run: | diff --git a/distribution/macos/create_macos_build_ava.sh b/distribution/macos/create_macos_build_ava.sh index b19fa4863..de6fab358 100755 --- a/distribution/macos/create_macos_build_ava.sh +++ b/distribution/macos/create_macos_build_ava.sh @@ -67,11 +67,11 @@ python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_APP_ if ! [ -x "$(command -v lipo)" ]; then - if ! [ -x "$(command -v llvm-lipo-14)" ]; + if ! [ -x "$(command -v llvm-lipo-17)" ]; then LIPO=llvm-lipo else - LIPO=llvm-lipo-14 + LIPO=llvm-lipo-17 fi else LIPO=lipo -- 2.47.1 From 7b1e1b1f0713753fcc6e2c45955a10b6ad60f283 Mon Sep 17 00:00:00 2001 From: GabCoolDude Date: Sun, 12 Jan 2025 21:07:52 +0100 Subject: [PATCH 2/5] Fix macos builds failed at bundle_fix_up.py --- .github/workflows/build.yml | 2 +- .github/workflows/canary.yml | 8 ++++---- .github/workflows/release.yml | 4 ++-- distribution/macos/bundle_fix_up.py | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aeb12a575..c9a6efc2f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -133,7 +133,7 @@ jobs: run: | wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh - sudo ./llvm.sh 14 + sudo ./llvm.sh 17 - name: Install rcodesign run: | diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index d93d4fbed..771451161 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -21,9 +21,9 @@ env: DOTNET_CLI_TELEMETRY_OPTOUT: 1 RYUJINX_BASE_VERSION: "1.2" RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "canary" - RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "Ryubing" + RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "GabCoolDude" RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO: "Ryujinx" - RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Canary-Releases" + RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx-Canary" RELEASE: 1 jobs: @@ -210,11 +210,11 @@ jobs: with: global-json-file: global.json - - name: Setup LLVM 15 + - name: Setup LLVM 17 run: | wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh - sudo ./llvm.sh 15 + sudo ./llvm.sh 17 - name: Install rcodesign run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ab39634f7..7e11f6edf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -191,11 +191,11 @@ jobs: with: global-json-file: global.json - - name: Setup LLVM 15 + - name: Setup LLVM 17 run: | wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh - sudo ./llvm.sh 15 + sudo ./llvm.sh 17 - name: Install rcodesign run: | diff --git a/distribution/macos/bundle_fix_up.py b/distribution/macos/bundle_fix_up.py index a8e3ac760..273d7455d 100644 --- a/distribution/macos/bundle_fix_up.py +++ b/distribution/macos/bundle_fix_up.py @@ -19,7 +19,7 @@ if platform.system() == "Darwin": else: OTOOL = shutil.which("llvm-otool") if OTOOL is None: - for llvm_ver in [15, 14, 13]: + for llvm_ver in [17, 16, 15, 14, 13]: otool_path = shutil.which(f"llvm-otool-{llvm_ver}") if otool_path is not None: OTOOL = otool_path -- 2.47.1 From e5ee3f8ce1cdf46ea3f2c250874f5e8171bd375e Mon Sep 17 00:00:00 2001 From: GabCoolDude Date: Sun, 12 Jan 2025 21:09:30 +0100 Subject: [PATCH 3/5] meh who cares about headless anyways --- distribution/macos/create_macos_build_headless.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/distribution/macos/create_macos_build_headless.sh b/distribution/macos/create_macos_build_headless.sh index 01951d878..5de862a2f 100755 --- a/distribution/macos/create_macos_build_headless.sh +++ b/distribution/macos/create_macos_build_headless.sh @@ -62,11 +62,11 @@ python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_OUTP if ! [ -x "$(command -v lipo)" ]; then - if ! [ -x "$(command -v llvm-lipo-14)" ]; + if ! [ -x "$(command -v llvm-lipo-17)" ]; then LIPO=llvm-lipo else - LIPO=llvm-lipo-14 + LIPO=llvm-lipo-17 fi else LIPO=lipo -- 2.47.1 From 0e763de3341f7729bb68d3fd88501adaa8b029f4 Mon Sep 17 00:00:00 2001 From: GabCoolDude Date: Sun, 12 Jan 2025 21:14:05 +0100 Subject: [PATCH 4/5] please --- distribution/macos/construct_universal_dylib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/macos/construct_universal_dylib.py b/distribution/macos/construct_universal_dylib.py index b6c3770c6..5d9321860 100644 --- a/distribution/macos/construct_universal_dylib.py +++ b/distribution/macos/construct_universal_dylib.py @@ -26,7 +26,7 @@ else: LIPO = shutil.which("llvm-lipo") if LIPO is None: - for llvm_ver in [15, 14, 13]: + for llvm_ver in [17, 16, 15, 14, 13]: lipo_path = shutil.which(f"llvm-lipo-{llvm_ver}") if lipo_path is not None: LIPO = lipo_path -- 2.47.1 From a648da19ba53b63983329380c1ebcf234aadcc6f Mon Sep 17 00:00:00 2001 From: GabCoolDude Date: Sun, 12 Jan 2025 21:22:20 +0100 Subject: [PATCH 5/5] Final cleanup --- .github/workflows/build.yml | 2 +- .github/workflows/canary.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c9a6efc2f..0472fd5f7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -129,7 +129,7 @@ jobs: with: global-json-file: global.json - - name: Setup LLVM 14 + - name: Setup LLVM 17 run: | wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index 771451161..433e65cb2 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -21,9 +21,9 @@ 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: "Ryubing" RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO: "Ryujinx" - RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx-Canary" + RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Canary-Releases" RELEASE: 1 jobs: -- 2.47.1