Update CI workflows for Chaquopy build

Author: rtibbles

.github/workflows/build_apk.yml

@@ -102,10 +102,17 @@ jobs:
       # of whether this is being run from the local repository with workflow_dispatch
       # or from another repository with workflow_call.
       run: echo "sha=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
-    - name: Set up Python 3.9
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: '17'
+        cache: 'gradle'
+    - name: Set up Python 3.10
       uses: actions/setup-python@v6
       with:
-        python-version: 3.9
+        python-version: "3.10"
+        cache: 'pip'
     - name: Install Apt Dependencies
       # Dependencies installed here are taken from the buildozer Dockerfile:
       # https://github.com/kivy/buildozer/blob/master/Dockerfile#L45
@@ -122,24 +129,6 @@ jobs:
         libltdl-dev \
         patch \
         zlib1g-dev
-    - uses: actions/cache@v5
-      with:
-        # This is where python for android puts its intermediary build
-        # files - we cache this to improve build performance, but be
-        # aggressive in clearing the cache whenever any file changes
-        # in the repository, especially as we commit files to this folder
-        # too, so we don't want the cache to override these files.
-        # We achieve this by just caching on the currently checked out commit.
-        # Every time we update this repository, this commit will change,
-        # but repeated workflow calls for this commit will use the cache.
-        path: ./python-for-android
-        key: ${{ runner.os }}-python-for-android-${{ steps.get-commit.outputs.sha }}
-    - uses: actions/cache@v5
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
     - name: Download the tarfile from URL for workflow_dispatch
       if: ${{ github.event.inputs.tar-url }}
       run: make get-tar tar=${{ github.event.inputs.tar-url }}
@@ -153,7 +142,7 @@ jobs:
         name: ${{ inputs.tar-file-name }}
         path: tar
     - name: Install dependencies
-      run: pip install -r requirements.txt
+      run: pip install -r build-requirements.txt -r requirements.txt
     - name: Ensure that Android SDK dependencies are installed
       run: make setup
     - name: Build the aab

.github/workflows/pre-commit.yml

@@ -30,5 +30,12 @@ jobs:
     - uses: actions/checkout@v6
     - uses: actions/setup-python@v6
       with:
-        python-version: 3.9
+        python-version: "3.10"
+        cache: 'pip'
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: '17'
+        cache: 'gradle'
     - uses: pre-commit/action@v3.0.1

.github/workflows/release_apk.yml

@@ -35,17 +35,12 @@ jobs:
         with:
           repository: learningequality/kolibri-installer-android
           ref: ${{ inputs.ref }}
-      - name: Set up Python 3.9
+      - name: Set up Python 3.10
         uses: actions/setup-python@v6
         with:
-          python-version: 3.9
-      - uses: actions/cache@v5
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
+          python-version: "3.10"
+          cache: 'pip'
       - name: Install dependencies
-        run: pip install -r requirements.txt
+        run: pip install -r build-requirements.txt
       - name: Release APK
         run: python scripts/play_store_api.py release "${{ inputs.version-code }}"