Merge pull request #801 from tenzap/next-036-qt-android-ppa

Fix github workflow when building the Android APK
AlbrechtL · Feb 25, 2024 · 4d6751f · 4d6751f
2 parents 454cf33 + ebb8433
commit 4d6751f
Showing 1 changed file with 63 additions and 24 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -1,9 +1,24 @@
 name: Android build
 
 #
-# This script uses the Qt for Android packages for Debian & derivatives from
+# This script can use the Qt for Android packages for Debian & derivatives from
+# any of these sources:
+#  - https://salsa.debian.org/bastif/qt-android
+#  - https://launchpad.net/~bastif/+archive/ubuntu/qt-android
+#
+# This is set by the value of the ORIGIN environment variable.
+#
+# If you modify the version of QT_ANDROID_PACKAGE, you must also update the
+# values of these env var accordingly (preferably the version with which
+# qt-android was built). That information is available on
 # https://salsa.debian.org/bastif/qt-android
 #
+#      ANDROID_BUILD_TOOLS_VER
+#      ANDROID_PLATFORM_VER
+#      ANDROID_NDK_ZIP
+#      ANDROID_NDK_VERSION
+#      ANDROID_NDK_SHA1
+#
 # If you want to build welle.io for Android yourself and produce a Multi-ABI
 # APK or AAB you might encouter these issues:
 #
@@ -25,13 +40,29 @@ jobs:
     name: Android build job
     runs-on: ubuntu-22.04
     env:
-      QT_ANDROID_JOB_REPO: bullseye-backports
-      QT_ANDROID_JOB_ID: 4247878 # Qt6.5.1 + custom install dir
-
-      #QT_ANDROID_JOB_REPO: testing
-      #QT_ANDROID_JOB_ID: 3206460 # Qt6.3 android-buil with OS's Host Qt (=doesn't provide qt-android-X.Y-host)
 
+      # ORIGIN: the source for the qt-android package. Can be one of
+      #   ppa:bastif/qt-android
+      #   salsa.debian.org
+      ORIGIN: salsa.debian.org
+
+      # Parameters for both salsa or launchpad (ie. ppa) origins
+      # When changing the version here, also update the Android SDK/NDK versions below.
+      #      ANDROID_BUILD_TOOLS_VER
+      #      ANDROID_PLATFORM_VER
+      #      ANDROID_NDK_ZIP
+      #      ANDROID_NDK_VERSION
+      #      ANDROID_NDK_SHA1
+      # That information is available on https://salsa.debian.org/bastif/qt-android
       QT_ANDROID_PACKAGE: qt-android-6.5
+
+      # Parameters for ORIGIN:salsa.debian.org
+      QT_ANDROID_SALSA_JOB_REPO: bullseye-backports
+      QT_ANDROID_SALSA_JOB_ID: 4921017 # Qt6.5.3
+
+      #QT_ANDROID_SALSA_JOB_REPO: testing
+      #QT_ANDROID_SALSA_JOB_ID: 3206460 # Qt6.3 android-buil with OS's Host Qt (=doesn't provide qt-android-X.Y-host)
+
       QT_ANDROID_HOST_HAS_CUSTOM_INSTALL_DIR: true # relevant only when not using OS's host Qt
       USE_OS_QT_AS_HOST: false
       USE_OS_QT_AS_HOST_FROM_TESTING: true
@@ -40,14 +71,14 @@ jobs:
       ANDROID_SDK_CMDLINE_TOOLS_SHA1: 5e7bf2dd563d34917d32f3c5920a85562a795c93
       ANDROID_BUILD_TOOLS_VER: 33.0.0
       #Used as compileSdk. It should be supported by the version of gradle shipped in QtAndroid
-      ANDROID_PLATFORM_VER: android-31
-      ANDROID_NDK_ZIP: android-ndk-r23c-linux.zip
-      ANDROID_NDK_VERSION: 23.2.8568313
-      ANDROID_NDK_SHA1: e5053c126a47e84726d9f7173a04686a71f9a67a
+      ANDROID_PLATFORM_VER: android-33
+      ANDROID_NDK_ZIP: android-ndk-r25b-linux.zip
+      ANDROID_NDK_VERSION: 25.1.8937393
+      ANDROID_NDK_SHA1: e27dcb9c8bcaa77b78ff68c3f23abcf6867959eb
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - run: git fetch --prune --unshallow --tags
 
@@ -63,19 +94,26 @@ jobs:
 
       # Build for Android using qt-android-6.4. Multi-ABI is back again since QT 6.3.
       # Supports for Multi-ABI is only with cmake (no more multi abi with qmake)
-      - name: Add qt-android repo (for ${{ env.QT_ANDROID_PACKAGE }} packages)
+      - name: Add qt-android repo from 'salsa.debian.org' (for ${{ env.QT_ANDROID_PACKAGE }} packages)
+        if: ${{ env.ORIGIN == 'salsa.debian.org' }}
         run: |
           sudo apt-get -y install wget
-          wget https://salsa.debian.org/bastif/qt-android/-/jobs/${QT_ANDROID_JOB_ID}/artifacts/raw/aptly/public-key.asc
+          wget https://salsa.debian.org/bastif/qt-android/-/jobs/${QT_ANDROID_SALSA_JOB_ID}/artifacts/raw/aptly/public-key.asc
           sudo cp public-key.asc /etc/apt/trusted.gpg.d/
-          sudo add-apt-repository "deb https://salsa.debian.org/bastif/qt-android/-/jobs/${QT_ANDROID_JOB_ID}/artifacts/raw/aptly ${QT_ANDROID_JOB_REPO} main" -y
-          
+          sudo add-apt-repository "deb https://salsa.debian.org/bastif/qt-android/-/jobs/${QT_ANDROID_SALSA_JOB_ID}/artifacts/raw/aptly ${QT_ANDROID_SALSA_JOB_REPO} main" -y
+
+      - name: Add qt-android repo from 'ppa:bastif/qt-android' (for ${{ env.QT_ANDROID_PACKAGE }} packages)
+        if: ${{ env.ORIGIN == 'ppa:bastif/qt-android' }}
+        run: |
+          sudo add-apt-repository "$ORIGIN"
+          sudo apt-get update
+
       # qt-android-6.2 depends on libjpeg62-turbo which is not shipped by Ubuntu.
       # So add debian bullseye repo and required keys
       - name: "Add Debian bullseye repo and required keys"
         # In later versions of qt-android, jpeg is disabled in host-build, so there is no more dependency to libjpeg.
         # So this step can be disabled
-        if: false
+        if: ${{ env.ORIGIN == 'salsa.debian.org' && false }}
         run: |
             sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138
             sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0E98404D386FA1D9
@@ -202,7 +240,7 @@ jobs:
                 if [ -d $ANDROID_SDK_ROOT/cmdline-tools/latest ]; then
                     CMDLINE_TOOLS_ROOT=$ANDROID_SDK_ROOT/cmdline-tools/latest
                 else
-                    if command -v fuse-zip; then sudo apt-get -y install fuse-zip; fi
+                    if ! command -v fuse-zip; then sudo apt-get -y install fuse-zip; fi
 
                     # Android SDK Command Line Tools
                     wget https://dl.google.com/android/repository/$ANDROID_SDK_CMDLINE_TOOLS_ZIP
@@ -231,7 +269,7 @@ jobs:
             if [ -e $ANDROID_SDK_ROOT/ndk/$ANDROID_NDK_VERSION ]; then
                 ln -s $ANDROID_SDK_ROOT/ndk/$ANDROID_NDK_VERSION ${HOME}/android-sdk/ndk
             else
-                if command -v fuse-zip; then sudo apt-get -y install fuse-zip; fi
+                if ! command -v fuse-zip; then sudo apt-get -y install fuse-zip; fi
 
                 wget https://dl.google.com/android/repository/$ANDROID_NDK_ZIP
                 echo "$ANDROID_NDK_SHA1 $ANDROID_NDK_ZIP" | sha1sum -c
@@ -272,6 +310,7 @@ jobs:
             cd build
             ${QT_INSTALL_BINDIR}/qt-cmake \
               -DQT_ANDROID_BUILD_ALL_ABIS=TRUE \
+              -DQT_ANDROID_DEPLOY_RELEASE=TRUE \
               -DQT_PATH_ANDROID_ABI_armeabi-v7a="${{ env.QT_PATH_ANDROID_ABI_armeabi-v7a }}" \
               -DQT_PATH_ANDROID_ABI_arm64-v8a="${{ env.QT_PATH_ANDROID_ABI_arm64-v8a }}" \
               -DQT_PATH_ANDROID_ABI_x86="${{ env.QT_PATH_ANDROID_ABI_x86 }}" \
@@ -292,7 +331,7 @@ jobs:
         run: |
             set -x
             cmake --build "build" --parallel
-            ls -al build/android-build/build/outputs/apk/debug/android-build-debug.apk
+            ls -al build/android-build/build/outputs/apk/*/*.apk
 
       - name: Upload to nightlies server
         env:
@@ -301,7 +340,7 @@ jobs:
         if: always() && steps.build_apk.outcome == 'success' && env.SFTP_USER != '' && env.SFTP_PASSWORD != ''
         run: |
           sudo apt-get -y install sshpass
-          sshpass -p "${SFTP_PASSWORD}" scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null build/android-build/build/outputs/apk/debug/android-build-debug.apk "${SFTP_USER}"@welle-io-nightlies.albrechtloh.de:/welle-io-nightlies.albrechtloh.de/${DATE}_${LAST_COMMIT_HASH}_Android_welle-io.apk
+          sshpass -p "${SFTP_PASSWORD}" scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null build/android-build/build/outputs/apk/*/*.apk "${SFTP_USER}"@welle-io-nightlies.albrechtloh.de:/welle-io-nightlies.albrechtloh.de/${DATE}_${LAST_COMMIT_HASH}_Android_welle-io.apk
 
       - name: Build with qmake
         id: build_apk_qmake
@@ -321,23 +360,23 @@ jobs:
 
       - name: Archive artifacts (welle.io apk)
         if: always() && steps.build_apk.outcome == 'success'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: welle.io apk (for all android abi)
-          path: build/android-build/build/outputs/apk/debug/*.apk
+          path: build/android-build/build/outputs/apk/*/*.apk
           if-no-files-found: error
 
       - name: Archive artifacts (welle.io apk built by qmake)
         if: always() && steps.build_apk_qmake.outcome == 'success'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: welle.io apk built by qmake (arm64-v8a only)
           path: qmake-build/src/welle-gui/android-build/build/outputs/apk/debug/android-build-debug.apk
           if-no-files-found: error
 
       - name: Archive artifacts (welle.io build dir)
         if: always() && steps.build_apk.outcome == 'failure'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: welle.io build dir
           path: build/*