Merge pull request #867 from nextcloud/android16_trixie

Android 16 to Debian Trixie

Author: nickvergessen

.github/workflows/build-test.yml

@@ -69,13 +69,15 @@ jobs:
         IMAGE=$(dirname ${{ matrix.dockerfile }})
         cd "$(dirname ${{ matrix.dockerfile }})"
         case "$IMAGE" in
+          android*)
+            PLATFORM="" ;;
           client*)
-            PLATFORM="linux/amd64" ;;
+            PLATFORM="--platform 'linux/amd64'" ;;
           translations*)
-            PLATFORM="linux/amd64" ;;
+            PLATFORM="--platform 'linux/amd64'" ;;
           *32bit)
-            PLATFORM="linux/386" ;;
+            PLATFORM="--platform 'linux/386'" ;;
           *)
-            PLATFORM="linux/amd64,linux/arm64'" ;;
+            PLATFORM="--platform 'linux/amd64,linux/arm64'" ;;
         esac
-        docker buildx build --platform "$PLATFORM" . --file Dockerfile
+        docker buildx build $PLATFORM . --file Dockerfile

.github/workflows/docker.yml

@@ -66,6 +66,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build container image
+        if: ${{ !startsWith(github.event.inputs.folderPath, 'android') }}
         uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
         with:
           platforms: ${{ (startsWith(github.event.inputs.folderPath, 'client') || startsWith(github.event.inputs.folderPath, 'translations')) && 'linux/amd64' || (endsWith(github.event.inputs.folderPath, '32bit') && 'linux/386' || 'linux/amd64,linux/arm64') }}
@@ -74,3 +75,14 @@ jobs:
           file: '${{ github.event.inputs.folderPath }}/${{ github.event.inputs.dockerFile }}'
           tags: |
             ghcr.io/nextcloud/continuous-integration-${{ github.event.inputs.folderPath }}${{ github.event.inputs.suffix }}:${{ github.event.inputs.tagName }}
+
+      # Android needs without platform to be able to build with buildx
+      - name: Build container image (Android)
+        if: ${{ startsWith(github.event.inputs.folderPath, 'android') }}
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
+        with:
+          push: true
+          context: ${{ github.event.inputs.folderPath }}
+          file: '${{ github.event.inputs.folderPath }}/${{ github.event.inputs.dockerFile }}'
+          tags: |
+            ghcr.io/nextcloud/continuous-integration-${{ github.event.inputs.folderPath }}${{ github.event.inputs.suffix }}:${{ github.event.inputs.tagName }}

android16/Dockerfile

@@ -1,6 +1,4 @@
-FROM ghcr.io/nextcloud/continuous-integration-android-androidbase:5
+FROM ghcr.io/nextcloud/continuous-integration-android-androidbase:latest
 
 # Android 16 (API 36)
-RUN sdkmanager "platforms;android-36"
-RUN sdkmanager "system-images;android-36;google_apis;x86_64"
-RUN (sleep 5; echo "no") | avdmanager create avd -n android -c 100M -k "system-images;android-36;google_apis;x86_64"
+RUN sdkmanager "platforms;android-36" && sdkmanager "system-images;android-36;google_apis;x86_64" && (sleep 5; echo "no") | avdmanager create avd -n android -c 100M -k "system-images;android-36;google_apis;x86_64"