From d18aaaef7ff632e45bc3ffd5a3814c2889589d14 Mon Sep 17 00:00:00 2001
From: Olivier Patry <olivier.patry@gmail.com>
Date: Mon, 30 Sep 2024 23:26:25 +0200
Subject: [PATCH] CI

---
 .github/workflows/build.yml | 41 ++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f3223c0d..6cac6521 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,15 +31,12 @@ jobs:
       with:
         add-job-summary-as-pr-comment: on-failure
 
+    - name: 🔓 Decrypt secrets
+      run: ./_ci/decrypt_secrets.sh
+
     - name: ✅ Test
-      run: |
-            # `test` to trigger as much Jvm tests as possible
-            # `:tasks-app-android:testStoreReleaseUnitTest` to restrict to only specific flavor(store)+variant(release) for `:tasks-app-android` module.
-            # `-x :tasks-app-android:test` to remove all tests from `:tasks-app-android` module not being covered by `:tasks-app-android:testStoreReleaseUnitTest`.
-            # `-x testDebugUnitTest` to avoid triggering tests both in debug & release build.
-            # `-x :tasks-app-android:build` to avoid triggering useless build tasks (typically for unused flavors).
-            #      Only rely on dependencies of `:tasks-app-android:testStoreReleaseUnitTest`.
-            ./gradlew --no-daemon test :tasks-app-android:testStoreReleaseUnitTest -x :tasks-app-android:test -x testDebugUnitTest -x :tasks-app-android:build
+      run: ./gradlew --no-daemon test :tasks-app-android:testStoreReleaseUnitTest \
+            -x :tasks-app-android:test -x testDebugUnitTest -x :tasks-app-android:build
 
     - name: 🔨 Build Desktop App 🖥️
       run: ./gradlew --no-daemon :tasks-app-desktop:assemble
@@ -49,23 +46,21 @@ jobs:
         PLAYSTORE_SECRET_PASSPHRASE: ${{ secrets.PLAYSTORE_SECRET_PASSPHRASE }}
         KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
         KEYSTORE_KEY_PASSWORD: ${{ secrets.KEYSTORE_KEY_PASSWORD }}
-      run: |
-            ./_ci/decrypt_secrets.sh
-            ./gradlew --no-daemon :tasks-app-android:assembleStoreRelease \
-              -Pci=true \
-              -Pplaystore.keystore.file="${PWD}/_ci/tasksApp.keystore" \
-              -Pplaystore.keystore.password="${KEYSTORE_PASSWORD}" \
-              -Pplaystore.keystore.key_password="${KEYSTORE_KEY_PASSWORD}"
+      run: ./gradlew --no-daemon :tasks-app-android:assembleStoreRelease \
+            -Pci=true \
+            -Pplaystore.keystore.file="${PWD}/_ci/tasksApp.keystore" \
+            -Pplaystore.keystore.password="${KEYSTORE_PASSWORD}" \
+            -Pplaystore.keystore.key_password="${KEYSTORE_KEY_PASSWORD}"
 
+    # `test` to trigger as much Jvm tests as possible
+    # `:tasks-app-android:testStoreReleaseUnitTest` to restrict to only specific flavor(store)+variant(release) for `:tasks-app-android` module.
+    # `-x :tasks-app-android:test` to remove all tests from `:tasks-app-android` module not being covered by `:tasks-app-android:testStoreReleaseUnitTest`.
+    # `-x testDebugUnitTest` to avoid triggering tests both in debug & release build.
+    # `-x :tasks-app-android:build` to avoid triggering useless build tasks (typically for unused flavors).
+    #      Only rely on dependencies of `:tasks-app-android:testStoreReleaseUnitTest`.
     - name: ✅ Test
-      run: |
-            # `test` to trigger as much Jvm tests as possible
-            # `:tasks-app-android:testStoreReleaseUnitTest` to restrict to only specific flavor(store)+variant(release) for `:tasks-app-android` module.
-            # `-x :tasks-app-android:test` to remove all tests from `:tasks-app-android` module not being covered by `:tasks-app-android:testStoreReleaseUnitTest`.
-            # `-x testDebugUnitTest` to avoid triggering tests both in debug & release build.
-            # `-x :tasks-app-android:build` to avoid triggering useless build tasks (typically for unused flavors).
-            #      Only rely on dependencies of `:tasks-app-android:testStoreReleaseUnitTest`.
-            ./gradlew --no-daemon test :tasks-app-android:testStoreReleaseUnitTest -x :tasks-app-android:test -x testDebugUnitTest -x :tasks-app-android:build
+      run: ./gradlew --no-daemon test :tasks-app-android:testStoreReleaseUnitTest \
+            -x :tasks-app-android:test -x testDebugUnitTest -x :tasks-app-android:build
 
     - name: 🗒️ Publish Test Reports
       uses: mikepenz/action-junit-report@v4