Update ci.yml

Author: thecompez

.github/workflows/ci.yml

@@ -180,7 +180,6 @@ jobs:
           fi
 
           mkdir -p "$OUT_DIR"
-
           DMG_PATH="${OUT_DIR}/GenyConnect-${VERSION}-macos-${{ matrix.target_arch }}.dmg"
 
           xattr -cr "$APP" || true
@@ -210,7 +209,6 @@ jobs:
           codesign --verify --deep --strict --verbose=4 "$APP"
 
           STAGING="$(mktemp -d)"
-
           cp -R "$APP" "$STAGING/GenyConnect.app"
           ln -s /Applications "$STAGING/Applications"
 
@@ -222,7 +220,6 @@ jobs:
             "$DMG_PATH"
 
           rm -rf "$STAGING"
-
           hdiutil verify "$DMG_PATH"
 
       - name: Verify macOS package
@@ -233,6 +230,11 @@ jobs:
 
           DMG="$(find build/final -type f -name "*.dmg" | head -n 1)"
 
+          if [[ -z "$DMG" ]]; then
+            echo "No DMG found."
+            exit 1
+          fi
+
           hdiutil verify "$DMG"
 
       - name: Package Windows
@@ -268,16 +270,6 @@ jobs:
           name: ${{ matrix.artifact_name }}
           path: artifacts/*
 
-      - name: Release desktop
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: softprops/action-gh-release@v2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          files: artifacts/*
-          fail_on_unmatched_files: true
-          generate_release_notes: true
-
   android:
     name: Build GenyConnect-android-arm64-v8a
     if: github.event_name != 'pull_request'
@@ -318,7 +310,10 @@ jobs:
             "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \
             "ndk;${ANDROID_NDK_VERSION}"
 
+          echo "ANDROID_SDK_ROOT=${ANDROID_SDK_ROOT}" >> "${GITHUB_ENV}"
+          echo "ANDROID_HOME=${ANDROID_SDK_ROOT}" >> "${GITHUB_ENV}"
           echo "ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk/${ANDROID_NDK_VERSION}" >> "${GITHUB_ENV}"
+          echo "ANDROID_NDK_HOME=${ANDROID_SDK_ROOT}/ndk/${ANDROID_NDK_VERSION}" >> "${GITHUB_ENV}"
 
       - name: Install Qt Android
         uses: jurplel/install-qt-action@v4
@@ -328,7 +323,7 @@ jobs:
           arch: ${{ env.QT_ARCH }}
           cache: true
 
-      - name: Save Qt paths
+      - name: Save Qt Android and host paths
         shell: bash
         run: |
           set -euo pipefail
@@ -344,6 +339,7 @@ jobs:
       - name: Install Linux dependencies
         shell: bash
         run: |
+          set -euo pipefail
           sudo apt-get update
           sudo apt-get install -y ninja-build unzip zip p7zip-full curl file
 
@@ -357,62 +353,120 @@ jobs:
         run: |
           set -euo pipefail
 
-          mkdir -p "${RUNNER_TEMP}/android-signing"
+          if [[ -z "${ANDROID_KEYSTORE_BASE64}" || -z "${ANDROID_KEYSTORE_PASSWORD}" || -z "${ANDROID_KEY_ALIAS}" || -z "${ANDROID_KEY_PASSWORD}" ]]; then
+            echo "Android signing secrets are incomplete."
+            exit 1
+          fi
 
+          mkdir -p "${RUNNER_TEMP}/android-signing"
           echo "${ANDROID_KEYSTORE_BASE64}" | base64 --decode > "${RUNNER_TEMP}/android-signing/release.keystore"
+          test -s "${RUNNER_TEMP}/android-signing/release.keystore"
 
           echo "QT_ANDROID_KEYSTORE_PATH=${RUNNER_TEMP}/android-signing/release.keystore" >> "${GITHUB_ENV}"
           echo "QT_ANDROID_KEYSTORE_ALIAS=${ANDROID_KEY_ALIAS}" >> "${GITHUB_ENV}"
           echo "QT_ANDROID_KEYSTORE_STORE_PASS=${ANDROID_KEYSTORE_PASSWORD}" >> "${GITHUB_ENV}"
           echo "QT_ANDROID_KEYSTORE_KEY_PASS=${ANDROID_KEY_PASSWORD}" >> "${GITHUB_ENV}"
 
-      - name: Configure Android
+      - name: Configure Android module scanner
         shell: bash
         run: |
           set -euo pipefail
 
           SCAN_DEPS="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang-scan-deps"
 
+          if [[ ! -x "${SCAN_DEPS}" ]]; then
+            echo "clang-scan-deps not found: ${SCAN_DEPS}"
+            find "${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin" -maxdepth 1 -type f | sort
+            exit 1
+          fi
+
+          echo "CLANG_SCAN_DEPS=${SCAN_DEPS}" >> "${GITHUB_ENV}"
+
+      - name: Configure Android Release
+        shell: bash
+        run: |
+          set -euo pipefail
+
           cmake -S . -B build -G Ninja \
             -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_PREFIX_PATH="${ANDROID_QT_ROOT}" \
             -DQt6_DIR="${ANDROID_QT_ROOT}/lib/cmake/Qt6" \
             -DQT_HOST_PATH="${QT_HOST_ROOT}" \
+            -DQT_HOST_PATH_CMAKE_DIR="${QT_HOST_ROOT}/lib/cmake" \
             -DQT_ANDROID_BUILD_TYPE=Release \
             -DQT_ANDROID_DEPLOY_RELEASE=ON \
             -DQT_ANDROID_SIGN_APK=ON \
             -DQT_ANDROID_SIGN_AAB=ON \
+            -DQT_ANDROID_KEYSTORE_PATH="${QT_ANDROID_KEYSTORE_PATH}" \
+            -DQT_ANDROID_KEYSTORE_ALIAS="${QT_ANDROID_KEYSTORE_ALIAS}" \
+            -DQT_ANDROID_KEYSTORE_STORE_PASS="${QT_ANDROID_KEYSTORE_STORE_PASS}" \
+            -DQT_ANDROID_KEYSTORE_KEY_PASS="${QT_ANDROID_KEYSTORE_KEY_PASS}" \
             -DCMAKE_TOOLCHAIN_FILE="${ANDROID_QT_ROOT}/lib/cmake/Qt6/qt.toolchain.cmake" \
             -DCMAKE_CXX_SCAN_FOR_MODULES=ON \
-            -DCMAKE_CXX_COMPILER_CLANG_SCAN_DEPS="${SCAN_DEPS}" \
+            -DCMAKE_CXX_COMPILER_CLANG_SCAN_DEPS="${CLANG_SCAN_DEPS}" \
             -DANDROID_ABI="${ANDROID_ABI}" \
             -DANDROID_PLATFORM="android-${ANDROID_API}" \
             -DANDROID_SDK_ROOT="${ANDROID_SDK_ROOT}" \
             -DANDROID_NDK_ROOT="${ANDROID_NDK_ROOT}" \
             -DQT_ANDROID_ABIS="${ANDROID_ABI}" \
+            -DGENYCONNECT_BUILD_DESKTOP=OFF \
             -DGENYCONNECT_BUILD_ANDROID=ON \
             -DGENYCONNECT_ENABLE_MOBILE_VPN=ON \
-            -DGENYCONNECT_USE_MODULES=ON
+            -DGENYCONNECT_AUTO_DOWNLOAD_XRAY=ON \
+            -DGENYCONNECT_USE_MODULES=ON \
+            -DGENYCONNECT_TARGET_OS=android \
+            -DGENYCONNECT_TARGET_ARCH="${TARGET_ARCH}" \
+            -DGENYCONNECT_TARGET_BUILD_ARCH="${TARGET_ARCH}"
 
       - name: Build Android APK
         shell: bash
         run: |
+          set -euo pipefail
           cmake --build build --config Release --target apk --parallel
 
       - name: Build Android AAB
         shell: bash
         run: |
+          set -euo pipefail
           cmake --build build --config Release --target aab --parallel
 
+      - name: Normalize Android artifact names
+        shell: bash
+        run: |
+          set -euo pipefail
+
+          OUT_DIR="build/final/android-${ANDROID_OUTPUT_ARCH}"
+          mkdir -p "${OUT_DIR}"
+
+          if [[ "${GITHUB_REF}" == refs/tags/v* ]]; then
+            VERSION="${GITHUB_REF_NAME#v}"
+          else
+            VERSION="$(grep -E 'project\(\$\{PROJECT_NAME\} VERSION ' CMakeLists.txt | sed -E 's/.*VERSION ([0-9]+\.[0-9]+\.[0-9]+).*/\1/')"
+          fi
+
+          APK="$(find build -type f \( -name "*release*.apk" -o -name "*.apk" \) | grep -vi debug | sort | head -n 1)"
+          AAB="$(find build -type f \( -name "*release*.aab" -o -name "*.aab" \) | grep -vi debug | sort | head -n 1)"
+
+          cp "${APK}" "${OUT_DIR}/GenyConnect-${VERSION}-android-${ANDROID_OUTPUT_ARCH}.apk"
+          cp "${AAB}" "${OUT_DIR}/GenyConnect-${VERSION}-android-${ANDROID_OUTPUT_ARCH}.aab"
+
+          ls -lah "${OUT_DIR}"
+
       - name: Collect Android packages
         shell: bash
         run: |
           set -euo pipefail
 
           mkdir -p artifacts
 
-          find build -type f -name "*.apk" -exec cp {} artifacts/ \;
-          find build -type f -name "*.aab" -exec cp {} artifacts/ \;
+          find build/final -type f -name "*.apk" -exec cp {} artifacts/ \;
+          find build/final -type f -name "*.aab" -exec cp {} artifacts/ \;
+
+          if [ -z "$(find artifacts -type f -print -quit)" ]; then
+            echo "No Android artifacts found."
+            find build -maxdepth 8 -type f | sort | tail -300
+            exit 1
+          fi
 
           ls -lah artifacts
 
@@ -422,12 +476,35 @@ jobs:
           name: GenyConnect-android-arm64-v8a
           path: artifacts/*
 
-      - name: Release Android
-        if: startsWith(github.ref, 'refs/tags/')
+  release:
+    name: Publish GitHub Release
+    if: startsWith(github.ref, 'refs/tags/')
+    needs:
+      - desktop
+      - android
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+
+    steps:
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: release-artifacts
+          merge-multiple: true
+
+      - name: List release files
+        shell: bash
+        run: |
+          set -euo pipefail
+          find release-artifacts -type f | sort
+
+      - name: Publish release
         uses: softprops/action-gh-release@v2
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ github.token }}
         with:
-          files: artifacts/*
+          files: release-artifacts/*
           fail_on_unmatched_files: true
           generate_release_notes: true