From 8513d02bbd0c8bdd23c73a1ec75ca4a5eaebb32c Mon Sep 17 00:00:00 2001 From: loathingKernel <142770+loathingKernel@users.noreply.github.com> Date: Tue, 9 Dec 2025 14:17:46 +0200 Subject: [PATCH 1/2] workflows: remove homebrew from macos runners --- .github/workflows/_job_cx-freeze-dmg.yml | 4 ++++ .github/workflows/_job_nuitka-linux.yml | 2 +- .github/workflows/_job_nuitka-macos.yml | 6 +++++- .github/workflows/_job_nuitka-windows.yml | 2 +- .github/workflows/_job_pypi.yml | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/_job_cx-freeze-dmg.yml b/.github/workflows/_job_cx-freeze-dmg.yml index 2002593c59..14e47d38a3 100644 --- a/.github/workflows/_job_cx-freeze-dmg.yml +++ b/.github/workflows/_job_cx-freeze-dmg.yml @@ -33,7 +33,11 @@ jobs: check-latest: true architecture: ${{ matrix.pyarch }} - name: Install build dependencies + env: + NONINTERACTIVE: 1 run: | + sudo /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/uninstall.sh)" + sudo rm -rfv /opt/homebrew/ pip3 install --upgrade cx_freeze ruff - name: Install target dependencies run: | diff --git a/.github/workflows/_job_nuitka-linux.yml b/.github/workflows/_job_nuitka-linux.yml index 9c178bdf85..9ca5c83eee 100644 --- a/.github/workflows/_job_nuitka-linux.yml +++ b/.github/workflows/_job_nuitka-linux.yml @@ -24,7 +24,7 @@ jobs: architecture: x64 - name: Install build dependencies run: | - pip3 install nuitka ruff + pip3 install --upgrade nuitka ruff - name: Install target dependencies run: | pip3 install -r misc/requirements.in diff --git a/.github/workflows/_job_nuitka-macos.yml b/.github/workflows/_job_nuitka-macos.yml index fc5dce331b..4b8d883c03 100644 --- a/.github/workflows/_job_nuitka-macos.yml +++ b/.github/workflows/_job_nuitka-macos.yml @@ -33,8 +33,12 @@ jobs: check-latest: true architecture: ${{ matrix.pyarch }} - name: Install build dependencies + env: + NONINTERACTIVE: 1 run: | - pip3 install nuitka ruff + sudo /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/uninstall.sh)" + sudo rm -rfv /opt/homebrew/ + pip3 install --upgrade nuitka ruff - name: Install target dependencies run: | pip3 install -r misc/requirements.in diff --git a/.github/workflows/_job_nuitka-windows.yml b/.github/workflows/_job_nuitka-windows.yml index f3b3626772..7cd96aa815 100644 --- a/.github/workflows/_job_nuitka-windows.yml +++ b/.github/workflows/_job_nuitka-windows.yml @@ -24,7 +24,7 @@ jobs: architecture: x64 - name: Install build dependencies run: | - pip3 install nuitka ruff + pip3 install --upgrade nuitka ruff - name: Install target dependencies run: | pip3 install -r misc/requirements.in diff --git a/.github/workflows/_job_pypi.yml b/.github/workflows/_job_pypi.yml index 59bf482a23..c83973cf90 100644 --- a/.github/workflows/_job_pypi.yml +++ b/.github/workflows/_job_pypi.yml @@ -28,7 +28,7 @@ jobs: - name: Install build dependencies run: | pip3 install --upgrade pip - pip3 install twine setuptools setuptools-scm ruff PySide6-Essentials + pip3 install --upgrade twine setuptools setuptools-scm ruff PySide6-Essentials - name: Prepare shell: bash env: From 301d775b00f8df8a8da1a2486597e20afca50597 Mon Sep 17 00:00:00 2001 From: loathingKernel <142770+loathingKernel@users.noreply.github.com> Date: Tue, 9 Dec 2025 15:12:44 +0200 Subject: [PATCH 2/2] project: target a tagged version in Rare's legendary fork --- misc/requirements-flatpak.in | 2 +- misc/requirements.in | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/misc/requirements-flatpak.in b/misc/requirements-flatpak.in index be3165ebdf..2dfe51d51b 100644 --- a/misc/requirements-flatpak.in +++ b/misc/requirements-flatpak.in @@ -3,7 +3,7 @@ installer setuptools-scm requests < 3.0 QtAwesome -legendary-gl @ git+https://github.com/RareDevs/legendary@4074375b789a4c2c87f72307bc9581900e34fa50 +legendary-gl @ git+https://github.com/RareDevs/legendary@rare-1.12.0 orjson vdf @ git+https://github.com/solsticegamestudios/vdf@be1f7220238022f8b29fe747f0b643f280bfdb6e pypresence diff --git a/misc/requirements.in b/misc/requirements.in index 77c67bc1f1..f669542bff 100644 --- a/misc/requirements.in +++ b/misc/requirements.in @@ -4,7 +4,7 @@ setuptools-scm requests < 3.0 PySide6-Essentials >= 6.8.1, < 6.9.2 QtAwesome -legendary-gl @ https://github.com/RareDevs/legendary/archive/4074375b789a4c2c87f72307bc9581900e34fa50.zip +legendary-gl @ https://github.com/RareDevs/legendary/archive/refs/tags/rare-1.12.0.zip orjson vdf @ https://github.com/solsticegamestudios/vdf/archive/be1f7220238022f8b29fe747f0b643f280bfdb6e.zip pywin32 ; platform_system == "Windows" diff --git a/pyproject.toml b/pyproject.toml index 223097b6b7..097eee6d4a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,7 +24,7 @@ dependencies = [ "requests < 3.0", "PySide6-Essentials >= 6.8.1, < 6.9.2", "QtAwesome", - "legendary-gl @ https://github.com/RareDevs/legendary/archive/4074375b789a4c2c87f72307bc9581900e34fa50.zip", + "legendary-gl @ https://github.com/RareDevs/legendary/archive/refs/tags/rare-1.12.0.zip", "orjson", "vdf @ https://github.com/solsticegamestudios/vdf/archive/be1f7220238022f8b29fe747f0b643f280bfdb6e.zip", "pywin32 ; platform_system == 'Windows'",