From 169c1d389e784b252db57c29585c359144419b5d Mon Sep 17 00:00:00 2001 From: reaperzxmc Date: Thu, 19 Mar 2026 01:42:10 +0700 Subject: [PATCH 1/4] chore: Update MobileGlues to 1.3.4 --- Natives/external/MobileGlues | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Natives/external/MobileGlues b/Natives/external/MobileGlues index f0fb4d3279..694dfc2dc2 160000 --- a/Natives/external/MobileGlues +++ b/Natives/external/MobileGlues @@ -1 +1 @@ -Subproject commit f0fb4d32794a130f4021342605a751ef2d0f84d8 +Subproject commit 694dfc2dc21b02eca020473fbff4e589f3045e2a From a660d1e9f1da0f24bcac6cd0280cc5b202123c69 Mon Sep 17 00:00:00 2001 From: ReaperZxMC Date: Thu, 19 Mar 2026 01:55:26 +0700 Subject: [PATCH 2/4] chore: Update MobileGlues to 1.3.4 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 135493707a..d11d40e50e 100644 --- a/Makefile +++ b/Makefile @@ -313,11 +313,11 @@ dep_mg: -DCMAKE_OSX_ARCHITECTURES=arm64 \ -DCMAKE_OSX_DEPLOYMENT_TARGET=14.0 \ -DCMAKE_C_FLAGS="-arch arm64" \ - $(SOURCEDIR)/Natives/external/MobileGlues/src/main/cpp/ + $(SOURCEDIR)/Natives/external/MobileGlues/MobileGlues-cpp/ cmake --build $(WORKINGDIR)/mobileglues --config RelWithDebInfo -j$(JOBS) --target mobileglues cp $(WORKINGDIR)/mobileglues/libmobileglues.dylib $(WORKINGDIR)/libmobileglues.dylib - cp $(SOURCEDIR)/Natives/external/MobileGlues/src/main/cpp/libraries/ios/libspirv-cross-c-shared.0.dylib $(WORKINGDIR)/libspirv-cross-c-shared.0.dylib + cp $(SOURCEDIR)/Natives/external/MobileGlues/MobileGlues-cpp/libraries/ios/libspirv-cross-c-shared.0.dylib $(WORKINGDIR)/libspirv-cross-c-shared.0.dylib echo '[Amethyst v$(VERSION)] dep_mg - end' assets: From 6283826e6f0fe968ee670c9572ef5cb2c31a3f51 Mon Sep 17 00:00:00 2001 From: ReaperZxMC Date: Thu, 19 Mar 2026 02:08:56 +0700 Subject: [PATCH 3/4] Update Makefile --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index d11d40e50e..eeb713c32a 100644 --- a/Makefile +++ b/Makefile @@ -317,7 +317,6 @@ dep_mg: cmake --build $(WORKINGDIR)/mobileglues --config RelWithDebInfo -j$(JOBS) --target mobileglues cp $(WORKINGDIR)/mobileglues/libmobileglues.dylib $(WORKINGDIR)/libmobileglues.dylib - cp $(SOURCEDIR)/Natives/external/MobileGlues/MobileGlues-cpp/libraries/ios/libspirv-cross-c-shared.0.dylib $(WORKINGDIR)/libspirv-cross-c-shared.0.dylib echo '[Amethyst v$(VERSION)] dep_mg - end' assets: From faa625b5a2c1c74bf58818f7179f7ed102c9a4d4 Mon Sep 17 00:00:00 2001 From: TheNullAstris Date: Mon, 1 Jun 2026 21:54:54 +0700 Subject: [PATCH 4/4] ci: use Zenith workflow for macos-15 runner --- .github/workflows/development.yml | 78 +++++++++++++++---------------- 1 file changed, 37 insertions(+), 41 deletions(-) diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml index 0c2c86b8ba..6f1223655e 100644 --- a/.github/workflows/development.yml +++ b/.github/workflows/development.yml @@ -1,49 +1,56 @@ name: Development build on: - pull_request: - branches-ignore: - - 'l10n_main' - types: [opened, reopened] - push: - branches-ignore: - - 'l10n_main' workflow_dispatch: jobs: build: name: Development build + permissions: + contents: write strategy: matrix: include: - platform: 2 platform_name: ios - - runs-on: J316sAP + + runs-on: macos-15 + steps: - name: Remove work folders run: | - echo "before" - ls -lah ./ rm -rf ./* || true rm -rf ./.??* || true - echo "after" - ls -lah ./ - + - name: Checkout repository uses: actions/checkout@main - name: Checkout repository submodules run: git submodule update --init --recursive + - name: Set up Xcode version + uses: maxim-lobanov/setup-xcode@master + with: + xcode-version: '26.1' + + - name: Install build tools + run: brew install make ldid temurin@8 + + - name: Set up Java 8 + run: | + export JAVA_HOME=$(/usr/libexec/java_home -v 1.8) + echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV + echo "$JAVA_HOME/bin" >> $GITHUB_PATH + - name: Get gl4es latest commit hash id: gl4es-sha - run: echo "::set-output name=sha::$(echo $(git ls-remote https://github.com/PojavLauncherTeam/gl4es-114-extra refs/heads/master | grep -io '^\S*'))" shell: bash + run: | + echo "sha=$(git ls-remote https://github.com/PojavLauncherTeam/gl4es-114-extra refs/heads/master | grep -io '^\S*')" >> $GITHUB_OUTPUT - name: Cache gl4es uses: actions/cache@main - if: false # use gl4es 1.1.5 + if: false id: gl4es-cache with: path: gl4es/libs @@ -61,16 +68,15 @@ jobs: continue-on-error: true run: | cd gl4es - git config user.email "github-actions@users.noreply.github.com" - git config user.name "github-actions" - export PATH=/opt/procursus/bin:$PATH + git config --global user.email "github-actions@users.noreply.github.com" + git config --global user.name "github-actions" wget https://github.com/leetal/ios-cmake/raw/master/ios.toolchain.cmake cmake -B build -DCMAKE_TOOLCHAIN_FILE=ios.toolchain.cmake -DDEFAULT_ES=2 \ -DNOX11=ON -DNOEGL=OFF -DSTATICLIB=OFF -DPLATFORM=OS64 \ -DCMAKE_C_FLAGS=-Wno-error=implicit-function-declaration cmake --build build --config RelWithDebInfo --target GL cp -R lib/libGL.dylib ../Natives/resources/Frameworks/libgl4es_114.dylib - + - name: Push gl4es if: false && github.event != 'pull_request' && github.ref_name == 'main' && steps.gl4es-cache.outputs.cache-hit != 'true' continue-on-error: true @@ -84,44 +90,34 @@ jobs: export PATH=/opt/homebrew/bin:$PATH export SLIMMED=1 if [ "${{ matrix.platform_name }}" == "ios" ]; then - # Build ipa and tipa for iOS + gmake -j1 java PLATFORM=${{ matrix.platform }} gmake -j$(sysctl -n hw.ncpu) dsym package PLATFORM=${{ matrix.platform }} gmake -j$(sysctl -n hw.ncpu) dsym package PLATFORM=${{ matrix.platform }} TROLLSTORE_JIT_ENT=1 elif [ "${{ matrix.platform_name }}" == "tvos" ]; then - # Build tipa only for tvOS + gmake -j1 java PLATFORM=${{ matrix.platform }} gmake -j$(sysctl -n hw.ncpu) dsym package PLATFORM=${{ matrix.platform }} TROLLSTORE_JIT_ENT=1 else - # Build ipa only for everything else + gmake -j1 java PLATFORM=${{ matrix.platform }} gmake -j$(sysctl -n hw.ncpu) dsym package PLATFORM=${{ matrix.platform }} fi - name: Upload regular ipa uses: actions/upload-artifact@main with: - name: org.angelauramc.amethyst-${{ matrix.platform_name }}.ipa - path: artifacts/org.angelauramc.amethyst-*-${{ matrix.platform_name }}.ipa - + name: com.thenullastris.zenithlauncher-${{ matrix.platform_name }}.ipa + path: artifacts/com.thenullastris.zenithlauncher-*-${{ matrix.platform_name }}.ipa - name: Upload regular tipa uses: actions/upload-artifact@main with: - name: org.angelauramc.amethyst-${{ matrix.platform_name }}-trollstore.tipa - path: artifacts/org.angelauramc.amethyst-*-${{ matrix.platform_name }}-trollstore.tipa - + name: com.thenullastris.zenithlauncher-${{ matrix.platform_name }}-trollstore.tipa + path: artifacts/com.thenullastris.zenithlauncher-*-${{ matrix.platform_name }}-trollstore.tipa - name: Upload slimmed ipa uses: actions/upload-artifact@main with: - name: org.angelauramc.amethyst.slimmed-${{ matrix.platform_name }}.ipa - path: artifacts/org.angelauramc.amethyst.slimmed-*-${{ matrix.platform_name }}.ipa - + name: com.thenullastris.zenithlauncher.slimmed-${{ matrix.platform_name }}.ipa + path: artifacts/com.thenullastris.zenithlauncher.slimmed-*-${{ matrix.platform_name }}.ipa - name: Upload slimmed tipa uses: actions/upload-artifact@main with: - name: org.angelauramc.amethyst.slimmed-${{ matrix.platform_name }}-trollstore.tipa - path: artifacts/org.angelauramc.amethyst.slimmed-*-${{ matrix.platform_name }}-trollstore.tipa - - - name: Upload PojavLauncher.dSYM - uses: actions/upload-artifact@main - if: matrix.platform_name == 'ios' - with: - name: AngelAuraAmethyst.dSYM - path: artifacts/AngelAuraAmethyst.dSYM + name: com.thenullastris.zenithlauncher.slimmed-${{ matrix.platform_name }}-trollstore.tipa + path: artifacts/com.thenullastris.zenithlauncher.slimmed-*-${{ matrix.platform_name }}-trollstore.tipa