Merge branch 'rust-android-gradle-submodule'

6 files changed, 33 insertions, 6 deletions

diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml
index f6b9292c5d..3134d3c5a8 100644
--- a/.github/workflows/android-app.yml
+++ b/.github/workflows/android-app.yml
@@ -70,6 +70,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: Use custom container image if specified
         if: ${{ github.event.inputs.override_container_image != '' }}
@@ -151,7 +153,7 @@ jobs:
 
       - name: Build native libraries
         if: steps.cache-native-libs.outputs.cache-hit != 'true'
-        uses: burrunan/gradle-cache-action@v1
+        uses: burrunan/gradle-cache-action@v3
         with:
           job-id: jdk17
           arguments: cargoBuild${{ matrix.task-variant }}
@@ -203,7 +205,7 @@ jobs:
           submodules: true
 
       - name: Run gradle task
-        uses: burrunan/gradle-cache-action@v1
+        uses: burrunan/gradle-cache-action@v3
         with:
           job-id: jdk17
           arguments: ${{ matrix.gradle-task }}
@@ -238,7 +240,7 @@ jobs:
           echo "$KEYSTORE" | tr -d '\n\r' | base64 -d > /root/.android/debug.keystore
 
       - name: Compile app
-        uses: burrunan/gradle-cache-action@v1
+        uses: burrunan/gradle-cache-action@v3
         with:
           job-id: jdk17
           arguments: |
@@ -271,7 +273,7 @@ jobs:
           merge-multiple: true
 
       - name: Build app
-        uses: burrunan/gradle-cache-action@v1
+        uses: burrunan/gradle-cache-action@v3
         with:
           job-id: jdk17
           arguments: |
@@ -285,7 +287,7 @@ jobs:
           read-only: ${{ github.ref != 'refs/heads/main' }}
 
       - name: Build stagemole app
-        uses: burrunan/gradle-cache-action@v1
+        uses: burrunan/gradle-cache-action@v3
         if: >
           (needs.prepare.outputs.E2E_TEST_REPEAT != '0' &&
           needs.prepare.outputs.E2E_TEST_INFRA_FLAVOR == 'stagemole') ||
@@ -346,7 +348,7 @@ jobs:
           echo "$KEYSTORE" | tr -d '\n\r' | base64 -d > /root/.android/debug.keystore
 
       - name: Assemble instrumented test apk
-        uses: burrunan/gradle-cache-action@v1
+        uses: burrunan/gradle-cache-action@v3
         with:
           job-id: jdk17
           arguments: |
@@ -396,6 +398,8 @@ jobs:
       - name: Checkout repository
         if: ${{ matrix.test-repeat != 0 }}
         uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - uses: actions/download-artifact@v4
         if: ${{ matrix.test-repeat != 0 }}
@@ -461,6 +465,8 @@ jobs:
 
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - uses: actions/download-artifact@v4
         with:
@@ -533,6 +539,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - uses: actions/download-artifact@v4
         with:
diff --git a/.github/workflows/android-audit.yml b/.github/workflows/android-audit.yml
index e85e1571be..ad56613207 100644
--- a/.github/workflows/android-audit.yml
+++ b/.github/workflows/android-audit.yml
@@ -36,6 +36,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: Use custom container image if specified
         if: ${{ github.event.inputs.override_container_image != '' }}
@@ -62,6 +64,8 @@ jobs:
         run: echo "HOME=/root" >> $GITHUB_ENV
 
       - uses: actions/checkout@v4
+        with:
+          submodules: true
 
       # Needed to run git diff later
       - name: Fix git dir
@@ -86,6 +90,8 @@ jobs:
         run: echo "HOME=/root" >> $GITHUB_ENV
 
       - uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: Verify lockfile keys metadata
         run: android/scripts/lockfile -v
diff --git a/.github/workflows/android-kotlin-format-check.yml b/.github/workflows/android-kotlin-format-check.yml
index e2de1ff2af..8c63e8c99c 100644
--- a/.github/workflows/android-kotlin-format-check.yml
+++ b/.github/workflows/android-kotlin-format-check.yml
@@ -23,6 +23,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: Use custom container image if specified
         if: ${{ github.event.inputs.override_container_image != '' }}
@@ -48,6 +50,8 @@ jobs:
         run: echo "HOME=/root" >> $GITHUB_ENV
 
       - uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: Run ktfmt check
         run: android/gradlew -p android ktfmtCheck :buildSrc:ktfmtCheck
diff --git a/.github/workflows/android-reproducible-builds.yml b/.github/workflows/android-reproducible-builds.yml
index 13859f257e..6381690c8a 100644
--- a/.github/workflows/android-reproducible-builds.yml
+++ b/.github/workflows/android-reproducible-builds.yml
@@ -54,6 +54,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: ${{ needs.set-up-env.outputs.COMMIT_HASH }}
+          submodules: true
 
       - name: Fetch submodules and tags
         run: |
@@ -154,6 +155,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: ${{ needs.set-up-env.outputs.COMMIT_HASH }}
+          submodules: true
 
       - name: Fetch submodules and tags
         run: |
@@ -210,6 +212,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: ${{ needs.set-up-env.outputs.COMMIT_HASH }}
+          submodules: true
 
       - name: Download container apk
         uses: actions/download-artifact@v4
diff --git a/.github/workflows/android-static-analysis.yml b/.github/workflows/android-static-analysis.yml
index a657807180..5bc308bbb4 100644
--- a/.github/workflows/android-static-analysis.yml
+++ b/.github/workflows/android-static-analysis.yml
@@ -23,6 +23,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: Scan code
         uses: MobSF/mobsfscan@main
diff --git a/.github/workflows/android-xml-format-check.yml b/.github/workflows/android-xml-format-check.yml
index c53322fae6..bc09c88705 100644
--- a/.github/workflows/android-xml-format-check.yml
+++ b/.github/workflows/android-xml-format-check.yml
@@ -16,6 +16,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          submodules: true
       - name: Resolve container image
         run: |
           echo "inner_container_image=$(cat ./building/android-container-image.txt)" >> $GITHUB_ENV
@@ -35,6 +37,8 @@ jobs:
         run: echo "HOME=/root" >> $GITHUB_ENV
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          submodules: true
       - name: Run tidy
         shell: bash
         run: |-