TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-15 15:48:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use forked gl4es (patch GL3) + auto merge

Browse Source
This commit is contained in:
Duy Tran Khanh 2021-06-28 16:21:18 +07:00 committed by GitHub
parent 179b502576
commit 9593adba31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/android.yml vendored
View File

@ -25,7 +25,7 @@ jobs:
- name: Get gl4es latest commit hash - name: Get gl4es latest commit hash
id: gl4es-sha id: gl4es-sha
run: echo "::set-output name=sha::$(git ls-remote https://github.com/ptitSeb/gl4es refs/heads/master | grep -io '^\S*')" run: echo "::set-output name=sha::$(echo $(git ls-remote https://github.com/ptitSeb/gl4es refs/heads/master | grep -io '^\S*' && git ls-remote https://github.com/PojavLauncherTeam/gl4es refs/heads/master | grep -io '^\S*'))"
shell: bash shell: bash
- name: Cache gl4es - name: Cache gl4es
@ -39,7 +39,7 @@ jobs:
if: steps.gl4es-cache.outputs.cache-hit != 'true' if: steps.gl4es-cache.outputs.cache-hit != 'true'
uses: actions/checkout@v2 uses: actions/checkout@v2
with: with:
repository: 'ptitSeb/gl4es' repository: 'PojavLauncherTeam/gl4es'
path: 'gl4es' path: 'gl4es'
- name: Build gl4es - name: Build gl4es
@ -47,6 +47,10 @@ jobs:
continue-on-error: true continue-on-error: true
run: | run: |
cd gl4es cd gl4es
git remote add upstream https://github.com/ptitSeb/gl4es
git fetch upstream
git checkout master
git merge upstream/main || echo "Merge exit code $?"
mv ../Android_gl4es.mk Android.mk mv ../Android_gl4es.mk Android.mk
$ANDROID_NDK_HOME/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk NDK_DEBUG=1 $ANDROID_NDK_HOME/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk NDK_DEBUG=1