From 9593adba317c697da6addf11aa70319214a1158f Mon Sep 17 00:00:00 2001
From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com>
Date: Mon, 28 Jun 2021 16:21:18 +0700
Subject: [PATCH] Use forked gl4es (patch GL3) + auto merge

---
 .github/workflows/android.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 219a98896..2e1113fac 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -25,7 +25,7 @@ jobs:
 
     - name: Get gl4es latest commit hash
       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
       
     - name: Cache gl4es
@@ -39,7 +39,7 @@ jobs:
       if: steps.gl4es-cache.outputs.cache-hit != 'true'
       uses: actions/checkout@v2
       with:
-        repository: 'ptitSeb/gl4es'
+        repository: 'PojavLauncherTeam/gl4es'
         path: 'gl4es'
 
     - name: Build gl4es
@@ -47,6 +47,10 @@ jobs:
       continue-on-error: true
       run: |
         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
         $ANDROID_NDK_HOME/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk NDK_DEBUG=1