From 4f84a43b59d59c0590ed7b8d054a22cf396e9ed9 Mon Sep 17 00:00:00 2001 From: The Judge <53906078+thejudge156@users.noreply.github.com> Date: Sun, 18 Aug 2024 14:39:07 -0700 Subject: [PATCH 01/12] Update gradle.yml --- .github/workflows/gradle.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index beac8204..eccffd41 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -18,7 +18,6 @@ permissions: jobs: build: - runs-on: windows-2022 steps: @@ -34,7 +33,11 @@ jobs: with: ndk-version: r21d local-cache: true - - name: Make Gradle wrapper executable + - uses: nttld/setup-ndk@v1 + with: + ndk-version: r26b + local-cache: true + - name: Make Gradle wrapper executable and pull LFS run: git lfs pull | chmod +x ./gradlew - name: Build with Gradle uses: gradle/gradle-build-action@v2 From 6d66b651d5e9a786c616bb608daf24f1bbd8d921 Mon Sep 17 00:00:00 2001 From: The Judge <53906078+thejudge156@users.noreply.github.com> Date: Sun, 18 Aug 2024 14:49:36 -0700 Subject: [PATCH 02/12] Actually link to the SDK --- .github/workflows/gradle.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index eccffd41..6028654b 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -33,10 +33,12 @@ jobs: with: ndk-version: r21d local-cache: true + link-to-sdk: true - uses: nttld/setup-ndk@v1 with: ndk-version: r26b local-cache: true + link-to-sdk: true - name: Make Gradle wrapper executable and pull LFS run: git lfs pull | chmod +x ./gradlew - name: Build with Gradle From cfa4d9a45dd922017ce26a4afd2e03035a2424df Mon Sep 17 00:00:00 2001 From: The Judge Date: Sun, 18 Aug 2024 15:00:41 -0700 Subject: [PATCH 03/12] Fix local.properties check for actions --- wrapper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wrapper b/wrapper index 1e4cd0aa..f274fe72 160000 --- a/wrapper +++ b/wrapper @@ -1 +1 @@ -Subproject commit 1e4cd0aa46582cfe30a84db02e220bd934687186 +Subproject commit f274fe72452e3543dd00595591930ca516b6aa8d From 5168736b5c20770de39f6ab188db8ba676cefd0d Mon Sep 17 00:00:00 2001 From: The Judge Date: Sun, 18 Aug 2024 15:11:22 -0700 Subject: [PATCH 04/12] Add environment keys for keystore Why didn't we do this earlier --- wrapper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wrapper b/wrapper index f274fe72..661fe37b 160000 --- a/wrapper +++ b/wrapper @@ -1 +1 @@ -Subproject commit f274fe72452e3543dd00595591930ca516b6aa8d +Subproject commit 661fe37bb20a7b0d899337b3574f05d869cc29c9 From 5667951faddeb4e26bd2933f7891ef585de57c79 Mon Sep 17 00:00:00 2001 From: The Judge Date: Sun, 18 Aug 2024 15:25:04 -0700 Subject: [PATCH 05/12] use secrets --- .github/workflows/gradle.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 6028654b..b841eddc 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -41,7 +41,13 @@ jobs: link-to-sdk: true - name: Make Gradle wrapper executable and pull LFS run: git lfs pull | chmod +x ./gradlew + - name: Decode keystore + run: | + echo ${{ secrets.QCXR_KEYSTORE_BASE64 }} | base64 --decode > qcxr.keystore - name: Build with Gradle uses: gradle/gradle-build-action@v2 with: arguments: build + env: + QCXR_KEYSTORE_ALIAS: ${{ secrets.QCXR_KEYSTORE_ALIAS }} + QCXR_KEYSTORE_PASS: ${{ secrets.QCXR_KEYSTORE_PASS }} From 132d44bf87c38ee8228830f7af99340e0a421b72 Mon Sep 17 00:00:00 2001 From: The Judge <53906078+thejudge156@users.noreply.github.com> Date: Sun, 18 Aug 2024 15:36:30 -0700 Subject: [PATCH 06/12] Update gradle.yml --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index b841eddc..0144bced 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -43,7 +43,7 @@ jobs: run: git lfs pull | chmod +x ./gradlew - name: Decode keystore run: | - echo ${{ secrets.QCXR_KEYSTORE_BASE64 }} | base64 --decode > qcxr.keystore + echo -n ${{ secrets.QCXR_KEYSTORE_BASE64 }} | base64 --decode > qcxr.keystore - name: Build with Gradle uses: gradle/gradle-build-action@v2 with: From a2a00986938f599d56f140b169e8a6da5e268ce6 Mon Sep 17 00:00:00 2001 From: The Judge Date: Sun, 18 Aug 2024 17:12:13 -0700 Subject: [PATCH 07/12] Actions --- .github/workflows/gradle.yml | 2 ++ wrapper | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 0144bced..6bcf5a03 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -44,6 +44,8 @@ jobs: - name: Decode keystore run: | echo -n ${{ secrets.QCXR_KEYSTORE_BASE64 }} | base64 --decode > qcxr.keystore + env: + QCXR_KEYSTORE_BASE64: ${{ secrets.QCXR_KEYSTORE_BASE64 }} - name: Build with Gradle uses: gradle/gradle-build-action@v2 with: diff --git a/wrapper b/wrapper index 661fe37b..32d90684 160000 --- a/wrapper +++ b/wrapper @@ -1 +1 @@ -Subproject commit 661fe37bb20a7b0d899337b3574f05d869cc29c9 +Subproject commit 32d90684677668b4790e10ecd41bb3cc253cb479 From fd845f8d57cad3d64e67fa10783c1f079cefc4fe Mon Sep 17 00:00:00 2001 From: The Judge Date: Sun, 18 Aug 2024 17:39:53 -0700 Subject: [PATCH 08/12] actually use the variable --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 6bcf5a03..2b48b25b 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -43,7 +43,7 @@ jobs: run: git lfs pull | chmod +x ./gradlew - name: Decode keystore run: | - echo -n ${{ secrets.QCXR_KEYSTORE_BASE64 }} | base64 --decode > qcxr.keystore + echo -n $QCXR_KEYSTORE_BASE64 | base64 --decode > qcxr.keystore env: QCXR_KEYSTORE_BASE64: ${{ secrets.QCXR_KEYSTORE_BASE64 }} - name: Build with Gradle From 740ea49830c5f730757e693988e4e7c08790355e Mon Sep 17 00:00:00 2001 From: The Judge Date: Sun, 18 Aug 2024 19:05:39 -0700 Subject: [PATCH 09/12] Actions are painful --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 2b48b25b..3667dbe4 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -43,7 +43,7 @@ jobs: run: git lfs pull | chmod +x ./gradlew - name: Decode keystore run: | - echo -n $QCXR_KEYSTORE_BASE64 | base64 --decode > qcxr.keystore + bash -c 'base64 --decode <<< "$QCXR_KEYSTORE_BASE64" > config' env: QCXR_KEYSTORE_BASE64: ${{ secrets.QCXR_KEYSTORE_BASE64 }} - name: Build with Gradle From e3f42c2e0c851d6b202a5b7a16744aad4a1861bd Mon Sep 17 00:00:00 2001 From: The Judge Date: Sun, 18 Aug 2024 19:09:30 -0700 Subject: [PATCH 10/12] Fix path --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 3667dbe4..29ca0123 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -43,7 +43,7 @@ jobs: run: git lfs pull | chmod +x ./gradlew - name: Decode keystore run: | - bash -c 'base64 --decode <<< "$QCXR_KEYSTORE_BASE64" > config' + bash -c 'base64 --decode <<< "$QCXR_KEYSTORE_BASE64" > qcxr.keystore' env: QCXR_KEYSTORE_BASE64: ${{ secrets.QCXR_KEYSTORE_BASE64 }} - name: Build with Gradle From a25acea1ed3ae13afc55bc9c294df036cdbed6d2 Mon Sep 17 00:00:00 2001 From: The Judge Date: Sun, 18 Aug 2024 19:09:53 -0700 Subject: [PATCH 11/12] Update Module --- wrapper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wrapper b/wrapper index 32d90684..6b9b7a66 160000 --- a/wrapper +++ b/wrapper @@ -1 +1 @@ -Subproject commit 32d90684677668b4790e10ecd41bb3cc253cb479 +Subproject commit 6b9b7a66524e644d2b78d0fa621e6ffb61674302 From f4b398d12dd27d96ba819b9e002e30fd14cd334b Mon Sep 17 00:00:00 2001 From: The Judge <53906078+thejudge156@users.noreply.github.com> Date: Sun, 18 Aug 2024 19:32:32 -0700 Subject: [PATCH 12/12] Update gradle.yml --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 29ca0123..aacba099 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -5,7 +5,7 @@ # This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle -name: Java CI with Gradle +name: Build Pojlib on: workflow_dispatch: