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

git merge gl4es: add --allow-unrelated-histories

Browse Source
This commit is contained in:
Duy Tran Khanh 2021-07-12 17:20:41 +07:00 committed by GitHub
parent 18a65cefb7
commit be4ef3e6f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,7 @@ jobs:
git remote add upstream https://github.com/PojavLauncherTeam/gl4es git remote add upstream https://github.com/PojavLauncherTeam/gl4es
git fetch upstream git fetch upstream
git checkout master git checkout master
git merge upstream/master || echo "Merge exit code $?" git merge --allow-unrelated-histories upstream/master || echo "Merge exit code $?"
$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
- name: Install gl4es - name: Install gl4es