From 4623040a718a4e3a0418856e23e6824337d8be67 Mon Sep 17 00:00:00 2001 From: Google61 Date: Tue, 5 Apr 2022 02:29:52 +0300 Subject: [PATCH 1/6] Update android.yml --- .github/workflows/android.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 9df5b28cf..88977b53f 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -25,13 +25,11 @@ jobs: java-version: 1.8 - name: Get gl4es latest commit hash - if: github.ref == 'refs/heads/v3_openjdk' 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 - name: Cache gl4es - if: github.ref == 'refs/heads/v3_openjdk' uses: actions/cache@v2 id: gl4es-cache with: @@ -39,14 +37,14 @@ jobs: key: gl4es-android-shared-nodbg-test1-2-${{ steps.gl4es-sha.outputs.sha }} - name: Get gl4es - if: github.ref == 'refs/heads/v3_openjdk' && steps.gl4es-cache.outputs.cache-hit != 'true' + if: steps.gl4es-cache.outputs.cache-hit != 'true' uses: actions/checkout@v2 with: repository: 'ptitSeb/gl4es' path: 'gl4es' - name: Build gl4es - if: github.ref == 'refs/heads/v3_openjdk' && steps.gl4es-cache.outputs.cache-hit != 'true' + if: steps.gl4es-cache.outputs.cache-hit != 'true' continue-on-error: true run: | cd gl4es @@ -57,13 +55,13 @@ jobs: git checkout master git merge --allow-unrelated-histories upstream/master || echo "Merge exit code $?" $ANDROID_NDK_HOME/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk - - - name: Install gl4es - if: github.ref == 'refs/heads/v3_openjdk' && steps.gl4es-cache.outputs.cache-hit != 'true' - continue-on-error: true - run: | cp -R gl4es/libs/* app_pojavlauncher/src/main/jniLibs/ mv gl4es .. + + - name: Push gl4es + if: github.event != "pull_request" && steps.gl4es-cache.outputs.cache-hit != 'true' + continue-on-error: true + run: | git add . git commit -am "CI: Update gl4es" git push @@ -91,7 +89,7 @@ jobs: ./gradlew :jre_lwjgl3glfw:build - name: Build Google Play .aab - if: ${{ github.event_name == "push" && github.ref_name == "v3_openjdk" }} + if: github.repository_owner == "PojavLauncherTeam" && github.ref_name == "v3_openjdk" run: | ./gradlew :app_pojavlauncher:bundleGplay mv app_pojavlauncher/build/outputs/bundle/gplay/app_pojavlauncher-gplay.aab out/app-gplay.aab @@ -115,7 +113,7 @@ jobs: path: out/app-debug.apk - name: Upload onto the Google Play testing track - if: github.ref == 'refs/heads/v3_openjdk' && github.event_name == "push" + if: github.repository_owner == "PojavLauncherTeam" && github.ref_name == "v3_openjdk" uses: r0adkll/upload-google-play@v1.0.15 with: serviceAccountJsonPlainText: ${{ secrets.GPLAY_SERVICE_JSON }} From 06bbf9be5b40b1ba13c563cf4c4ae58cdcdc3b79 Mon Sep 17 00:00:00 2001 From: Google61 Date: Tue, 5 Apr 2022 02:44:30 +0300 Subject: [PATCH 2/6] Update android.yml --- .github/workflows/android.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 88977b53f..70ce32541 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -59,7 +59,7 @@ jobs: mv gl4es .. - name: Push gl4es - if: github.event != "pull_request" && steps.gl4es-cache.outputs.cache-hit != 'true' + if: github.event != 'pull_request' && steps.gl4es-cache.outputs.cache-hit != 'true' continue-on-error: true run: | git add . @@ -89,7 +89,7 @@ jobs: ./gradlew :jre_lwjgl3glfw:build - name: Build Google Play .aab - if: github.repository_owner == "PojavLauncherTeam" && github.ref_name == "v3_openjdk" + if: github.repository_owner == 'PojavLauncherTeam' && github.ref_name == 'v3_openjdk' run: | ./gradlew :app_pojavlauncher:bundleGplay mv app_pojavlauncher/build/outputs/bundle/gplay/app_pojavlauncher-gplay.aab out/app-gplay.aab From 160deb3075b9866ab76a9c1c6d68527b3937822c Mon Sep 17 00:00:00 2001 From: Google61 Date: Tue, 5 Apr 2022 02:46:33 +0300 Subject: [PATCH 3/6] Update android.yml --- .github/workflows/android.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 70ce32541..f9216b4c9 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -113,7 +113,7 @@ jobs: path: out/app-debug.apk - name: Upload onto the Google Play testing track - if: github.repository_owner == "PojavLauncherTeam" && github.ref_name == "v3_openjdk" + if: github.repository_owner == 'PojavLauncherTeam' && github.ref_name == 'v3_openjdk' uses: r0adkll/upload-google-play@v1.0.15 with: serviceAccountJsonPlainText: ${{ secrets.GPLAY_SERVICE_JSON }} From bba4207e5d4164b4ad5d238be149d8d3a08f486e Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 4 Apr 2022 23:47:22 +0000 Subject: [PATCH 4/6] CI: Update gl4es --- gl4es | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gl4es b/gl4es index baf1c7482..2856e133a 160000 --- a/gl4es +++ b/gl4es @@ -1 +1 @@ -Subproject commit baf1c7482ee8dd138324a1f670fc04706723ed83 +Subproject commit 2856e133a53620c7b04461818fc4fa89bce7671b From a4f241c0ae324974c704d5044293161f2517053f Mon Sep 17 00:00:00 2001 From: Google61 Date: Tue, 5 Apr 2022 02:53:41 +0300 Subject: [PATCH 5/6] Update android.yml --- .github/workflows/android.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index f9216b4c9..635f40b9f 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -34,13 +34,13 @@ jobs: id: gl4es-cache with: path: gl4es/libs - key: gl4es-android-shared-nodbg-test1-2-${{ steps.gl4es-sha.outputs.sha }} + key: gl4es-holy-android-shared-${{ steps.gl4es-sha.outputs.sha }} - name: Get gl4es if: steps.gl4es-cache.outputs.cache-hit != 'true' uses: actions/checkout@v2 with: - repository: 'ptitSeb/gl4es' + repository: 'PojavLauncherTeam/gl4es-114-extra' path: 'gl4es' - name: Build gl4es @@ -50,10 +50,6 @@ jobs: cd gl4es git config --global user.email "github-actions@users.noreply.github.com" git config --global user.name "github-actions" - git remote add upstream https://github.com/PojavLauncherTeam/gl4es-114-extra - git fetch upstream - git checkout master - git merge --allow-unrelated-histories upstream/master || echo "Merge exit code $?" $ANDROID_NDK_HOME/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk cp -R gl4es/libs/* app_pojavlauncher/src/main/jniLibs/ mv gl4es .. From f691503dfc00055bc1714a96b2cdf3c3eae30cb7 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 4 Apr 2022 23:55:24 +0000 Subject: [PATCH 6/6] CI: Update gl4es --- gl4es | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gl4es b/gl4es index 2856e133a..d98d07d73 160000 --- a/gl4es +++ b/gl4es @@ -1 +1 @@ -Subproject commit 2856e133a53620c7b04461818fc4fa89bce7671b +Subproject commit d98d07d73ac31cef331bf6169375b7073f98a4bb