From b570632124c57db688f9f84651163deea36c94ca Mon Sep 17 00:00:00 2001
From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com>
Date: Mon, 25 Jan 2021 18:13:10 +0700
Subject: [PATCH] Update android.yml

---
 .github/workflows/android.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 1b26db655..ebc5b2e41 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -26,7 +26,10 @@ jobs:
       continue-on-error: true
       run: |
         cd gl4es
-        git pull https://github.com/ptitSeb/gl4es master
+        git remote add upstream https://github.com/ptitSeb/gl4es
+        git fetch upstream
+        git checkout master
+        git merge upstream/main || echo "Merge exit code $?"
         ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk
         cp -R libs/* ../PojavLauncher/app_pojavlauncher/src/main/jniLibs/