From 0be37ad08eb5b052e2e13d272134702c81c355cc Mon Sep 17 00:00:00 2001 From: Carifio24 Date: Sun, 7 Apr 2024 03:17:58 -0400 Subject: [PATCH 01/10] Add build step to GH Actions workflow. --- .github/workflows/v3.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/v3.yml b/.github/workflows/v3.yml index 5c668ceae..50c76d40e 100644 --- a/.github/workflows/v3.yml +++ b/.github/workflows/v3.yml @@ -22,5 +22,9 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew + + - name: Build project + run: ./gradlew build + - name: Run tests run: ./gradlew test From 422bfd7cfccd1d2bfb9734d15ec3fb8b179deb9e Mon Sep 17 00:00:00 2001 From: Carifio24 Date: Sun, 7 Apr 2024 12:04:51 -0400 Subject: [PATCH 02/10] Clear gradle caches before build. --- .github/workflows/v3.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/v3.yml b/.github/workflows/v3.yml index 50c76d40e..184478738 100644 --- a/.github/workflows/v3.yml +++ b/.github/workflows/v3.yml @@ -23,6 +23,9 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew + - name: Clear gradle caches + run: rm -r /home/runner/.gradle/caches + - name: Build project run: ./gradlew build From 6e9853cd7a95ca6e1abcfdf9d4cf42254a0a3365 Mon Sep 17 00:00:00 2001 From: Carifio24 Date: Sat, 25 May 2024 11:31:27 -0400 Subject: [PATCH 03/10] Update workflow to decode keystore as GH secret. --- .github/workflows/v3.yml | 5 +++++ .gitignore | 3 ++- app/build.gradle | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/v3.yml b/.github/workflows/v3.yml index 184478738..c84c0380e 100644 --- a/.github/workflows/v3.yml +++ b/.github/workflows/v3.yml @@ -26,6 +26,11 @@ jobs: - name: Clear gradle caches run: rm -r /home/runner/.gradle/caches + - name: Decode keystore + run: | + echo "${{ secrets.KEYSTORE }}" > app/android_key.jks + gpg -d --passphrase "${{ secrets.KEYSTORE_PASSPHRASE }" --batch app/android_key.jks.asc > app/android_key.jks + - name: Build project run: ./gradlew build diff --git a/.gitignore b/.gitignore index 9e0c6f908..662cd2659 100644 --- a/.gitignore +++ b/.gitignore @@ -9,5 +9,6 @@ app/build/* # These will be in their own repository versions - local.properties + +app/android_key.jks diff --git a/app/build.gradle b/app/build.gradle index d7ab37940..d38749790 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'com.likethesalad.stem' android { signingConfigs { release { - storeFile file('/home/jon/keys/android_key.jks') + storeFile file('android_key.jks') storePassword System.getenv('ANDROID_KEYSTORE_PASSWORD') keyAlias System.getenv('ANDROID_KEYSTORE_ALIAS') keyPassword System.getenv('ANDROID_KEY_PASSWORD') From 08ba4f3dc3ac8ed0837f54a5dc39642445237897 Mon Sep 17 00:00:00 2001 From: Carifio24 Date: Sat, 25 May 2024 11:43:40 -0400 Subject: [PATCH 04/10] Fix typo in workflow file. --- .github/workflows/v3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/v3.yml b/.github/workflows/v3.yml index c84c0380e..1f8fa7ad4 100644 --- a/.github/workflows/v3.yml +++ b/.github/workflows/v3.yml @@ -29,7 +29,7 @@ jobs: - name: Decode keystore run: | echo "${{ secrets.KEYSTORE }}" > app/android_key.jks - gpg -d --passphrase "${{ secrets.KEYSTORE_PASSPHRASE }" --batch app/android_key.jks.asc > app/android_key.jks + gpg -d --passphrase "${{ secrets.KEYSTORE_PASSPHRASE }}" --batch app/android_key.jks.asc > app/android_key.jks - name: Build project run: ./gradlew build From f226a8e4a199c6ae02c09b87171c6b8ea761ec58 Mon Sep 17 00:00:00 2001 From: Carifio24 Date: Sat, 25 May 2024 11:50:22 -0400 Subject: [PATCH 05/10] Don't fail if Gradle caches don't exist. --- .github/workflows/v3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/v3.yml b/.github/workflows/v3.yml index 1f8fa7ad4..71e09e284 100644 --- a/.github/workflows/v3.yml +++ b/.github/workflows/v3.yml @@ -24,7 +24,7 @@ jobs: run: chmod +x gradlew - name: Clear gradle caches - run: rm -r /home/runner/.gradle/caches + run: rm -rf /home/runner/.gradle/caches - name: Decode keystore run: | From d0bc021d51e80d3add5160659cee461fbabdae98 Mon Sep 17 00:00:00 2001 From: Carifio24 Date: Sat, 25 May 2024 11:57:55 -0400 Subject: [PATCH 06/10] Specify environment in workflow file. --- .github/workflows/v3.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/v3.yml b/.github/workflows/v3.yml index 71e09e284..0c355d20c 100644 --- a/.github/workflows/v3.yml +++ b/.github/workflows/v3.yml @@ -10,6 +10,7 @@ jobs: build: runs-on: ubuntu-latest + environment: Version 3 CI steps: - uses: actions/checkout@v3 From 108b6774d700e6071d5b265a2abb9e5bef0384a2 Mon Sep 17 00:00:00 2001 From: Carifio24 Date: Sat, 25 May 2024 12:05:41 -0400 Subject: [PATCH 07/10] echo into the right place. --- .github/workflows/v3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/v3.yml b/.github/workflows/v3.yml index 0c355d20c..43a4bb257 100644 --- a/.github/workflows/v3.yml +++ b/.github/workflows/v3.yml @@ -29,7 +29,7 @@ jobs: - name: Decode keystore run: | - echo "${{ secrets.KEYSTORE }}" > app/android_key.jks + echo "${{ secrets.KEYSTORE }}" > app/android_key.jks.asc gpg -d --passphrase "${{ secrets.KEYSTORE_PASSPHRASE }}" --batch app/android_key.jks.asc > app/android_key.jks - name: Build project From de13a3ba5d64ac4c659e6cc63a31bedfb24d5827 Mon Sep 17 00:00:00 2001 From: Jon Carifio Date: Mon, 27 May 2024 02:19:20 -0400 Subject: [PATCH 08/10] Remove Java cache setting --- .github/workflows/v3.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/v3.yml b/.github/workflows/v3.yml index 43a4bb257..0f09a7036 100644 --- a/.github/workflows/v3.yml +++ b/.github/workflows/v3.yml @@ -19,7 +19,6 @@ jobs: with: java-version: '11' distribution: 'temurin' - cache: gradle - name: Grant execute permission for gradlew run: chmod +x gradlew From 5f9f3e3b696a23456a7853e839cb201e667bdf2a Mon Sep 17 00:00:00 2001 From: Carifio24 Date: Mon, 27 May 2024 02:39:39 -0400 Subject: [PATCH 09/10] Restore workflow cache and bump CI Java version. --- .github/workflows/v3.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/v3.yml b/.github/workflows/v3.yml index 0f09a7036..b91591f8b 100644 --- a/.github/workflows/v3.yml +++ b/.github/workflows/v3.yml @@ -17,8 +17,9 @@ jobs: - name: set up JDK 11 uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'temurin' + cache: 'gradle' - name: Grant execute permission for gradlew run: chmod +x gradlew From 377703961a6128431036ee4854083f36055c40e5 Mon Sep 17 00:00:00 2001 From: Carifio24 Date: Mon, 27 May 2024 02:49:18 -0400 Subject: [PATCH 10/10] Setup Android SDK in workflow. --- .github/workflows/v3.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/v3.yml b/.github/workflows/v3.yml index b91591f8b..8126c24e4 100644 --- a/.github/workflows/v3.yml +++ b/.github/workflows/v3.yml @@ -14,6 +14,7 @@ jobs: steps: - uses: actions/checkout@v3 + - name: set up JDK 11 uses: actions/setup-java@v3 with: @@ -24,6 +25,9 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew + - name: Setup Android SDK + uses: android-actions/setup-android@v3 + - name: Clear gradle caches run: rm -rf /home/runner/.gradle/caches