chore: remove double build for macos ne and ios (#3464)

.github/workflows/deploy.yml

@@ -417,19 +417,24 @@ jobs:
         APPSTORE_CONNECT_KEY_ID: ${{ secrets.APPSTORE_CONNECT_KEY_ID }}
         APPSTORE_CONNECT_ISSUER_ID: ${{ secrets.APPSTORE_CONNECT_ISSUER_ID }}
         APPSTORE_CONNECT_PRIVATE_KEY: ${{ secrets.APPSTORE_CONNECT_PRIVATE_KEY }}
+        CONFIGURE_ONLY: ${{ startsWith(github.ref, 'refs/tags/') && 'true' || '' }}
       shell: bash
       run: |
         sh deploy/build.sh -t ios | sed -f deploy/hide_secrets.sed
 
-    - name: 'Archive and upload to TestFlight'
+    - name: 'Archive for App Store'
       if: startsWith(github.ref, 'refs/tags/')
       working-directory: deploy
       shell: bash
-      env:
-        APPSTORE_CONNECT_KEY_ID: ${{ secrets.APPSTORE_CONNECT_KEY_ID }}
-        APPSTORE_CONNECT_ISSUER_ID: ${{ secrets.APPSTORE_CONNECT_ISSUER_ID }}
-        APPSTORE_CONNECT_PRIVATE_KEY: ${{ secrets.APPSTORE_CONNECT_PRIVATE_KEY }}
-      run: fastlane ios testflight_upload 2>&1 | sed -f hide_secrets.sed
+      run: fastlane ios archive 2>&1 | sed -f hide_secrets.sed
+
+    - name: 'Upload App Store package'
+      if: startsWith(github.ref, 'refs/tags/')
+      uses: actions/upload-artifact@v7
+      with:
+        path: deploy/build/ios/AmneziaVPN.ipa
+        archive: false
+        retention-days: 7
 
 # ------------------------------------------------------
 
@@ -716,25 +721,31 @@ jobs:
     - name: 'Build project'
       env:
         QT_INSTALL_DIR: ${{ runner.temp }}
+        CONFIGURE_ONLY: ${{ startsWith(github.ref, 'refs/tags/') && 'true' || '' }}
       shell: bash
       run: deploy/build.sh -t macos-ne | sed -f deploy/hide_secrets.sed
 
     - name: 'Upload unpacked artifact'
+      if: ${{ !startsWith(github.ref, 'refs/tags/') }}
       uses: actions/upload-artifact@v4
       with:
         name: AmneziaVPN_MacOS_unpacked
         path: deploy/build/client/Release/AmneziaVPN.app
         retention-days: 7
 
-    - name: 'Archive and upload to TestFlight'
+    - name: 'Archive for App Store'
       if: startsWith(github.ref, 'refs/tags/')
       working-directory: deploy
       shell: bash
-      env:
-        APPSTORE_CONNECT_KEY_ID: ${{ secrets.APPSTORE_CONNECT_KEY_ID }}
-        APPSTORE_CONNECT_ISSUER_ID: ${{ secrets.APPSTORE_CONNECT_ISSUER_ID }}
-        APPSTORE_CONNECT_PRIVATE_KEY: ${{ secrets.APPSTORE_CONNECT_PRIVATE_KEY }}
-      run: fastlane mac testflight_upload 2>&1 | sed -f hide_secrets.sed
+      run: fastlane mac archive 2>&1 | sed -f hide_secrets.sed
+
+    - name: 'Upload App Store package'
+      if: startsWith(github.ref, 'refs/tags/')
+      uses: actions/upload-artifact@v7
+      with:
+        path: deploy/build/osx/AmneziaVPN.pkg
+        archive: false
+        retention-days: 7
 
 # ------------------------------------------------------
 
@@ -1727,3 +1738,47 @@ jobs:
           gh release create "$TAG" dist/* --repo "$GITHUB_REPOSITORY" \
             --title "$TAG" --notes-file release-notes.md --draft --prerelease --verify-tag
         fi
+
+# ------------------------------------------------------
+
+  TestFlight:
+    if: startsWith(github.ref, 'refs/tags/')
+    needs: [Build-Linux-Ubuntu, Build-Windows, Build-iOS, Build-MacOS, Build-MacOS-NE, Build-Android]
+    runs-on: macos-26
+
+    env:
+      APPSTORE_CONNECT_KEY_ID: ${{ secrets.APPSTORE_CONNECT_KEY_ID }}
+      APPSTORE_CONNECT_ISSUER_ID: ${{ secrets.APPSTORE_CONNECT_ISSUER_ID }}
+      APPSTORE_CONNECT_PRIVATE_KEY: ${{ secrets.APPSTORE_CONNECT_PRIVATE_KEY }}
+
+    defaults:
+      run:
+        working-directory: deploy
+        shell: bash
+
+    steps:
+    - name: 'Get fastlane config'
+      uses: actions/checkout@v4
+      with:
+        sparse-checkout: |
+          deploy/fastlane
+          deploy/hide_secrets.sed
+        sparse-checkout-cone-mode: false
+
+    - name: 'Download iOS package'
+      uses: actions/download-artifact@v8
+      with:
+        name: AmneziaVPN.ipa
+        path: deploy/build/ios
+
+    - name: 'Download macOS package'
+      uses: actions/download-artifact@v8
+      with:
+        name: AmneziaVPN.pkg
+        path: deploy/build/osx
+
+    - name: 'Upload iOS build to TestFlight'
+      run: fastlane ios testflight_upload 2>&1 | sed -f hide_secrets.sed
+
+    - name: 'Upload macOS build to TestFlight'
+      run: fastlane mac testflight_upload 2>&1 | sed -f hide_secrets.sed

CMakeLists.txt

@@ -5,7 +5,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(PROJECT AmneziaVPN)
 if(NOT AMNEZIAVPN_VERSION)
-    set(AMNEZIAVPN_VERSION 5.1.1.1 CACHE STRING "Client app version")
+    set(AMNEZIAVPN_VERSION 5.1.1.2 CACHE STRING "Client app version")
 endif()
 
 set(QT_CREATOR_SKIP_PACKAGE_MANAGER_SETUP ON CACHE BOOL "" FORCE)

deploy/build.sh

@@ -35,6 +35,7 @@ while [[ $# -gt 0 ]]; do
         --aab)              : ${BUILD_AAB=true};     shift   ;;
         --apk)              : ${BUILD_APK=true};     shift   ;;
         --play)             : ${BUILD_PLAY=true};    shift   ;;
+        --configure-only)   : ${CONFIGURE_ONLY=true}; shift  ;;
         --help|-h|?)
             echo "Usage: $0 [options]"
             echo "  Options:"
@@ -49,6 +50,7 @@ while [[ $# -gt 0 ]]; do
             echo "  --aab                     - whether to build AAB. only applicable to Android"
             echo "  --apk                     - whether to build APK. use with --play. only applicable to Android"
             echo "  --play                    - build Play flavor (Google Play Billing). use with --aab or --apk. only applicable to Android"
+            echo "  --configure-only          - run CMake configure and skip the build"
             exit 0
             ;;
         *) echo "Unknown arg \"$1\". Use $0 -h to get help"; exit 1 ;;
@@ -217,6 +219,7 @@ if [[ -n "$FORCE" ]]; then
 fi
 
 run_traced cmake -S "$SOURCE_PATH" -B "$BUILD_PATH" "${args[@]}"
+[[ -n "$CONFIGURE_ONLY" ]] && exit 0
 run_traced cmake --build "$BUILD_PATH" --config "$CMAKE_BUILD_TYPE" --parallel "$JOBS"
 
 if [[ -n "$BUILD_AAB" ]]; then

deploy/fastlane/Fastfile

@@ -1,4 +1,15 @@
-def archive_and_upload(app_platform)
+def archive_build(app_platform)
+  build_app(
+    project: "build/AmneziaVPN.xcodeproj",
+    scheme: "AmneziaVPN",
+    configuration: "Release",
+    export_method: "app-store",
+    output_directory: "build/#{app_platform}",
+    output_name: "AmneziaVPN"
+  )
+end
+
+def authorize_app_store_connect
   key = ENV.fetch("APPSTORE_CONNECT_PRIVATE_KEY")
   app_store_connect_api_key(
     key_id: ENV.fetch("APPSTORE_CONNECT_KEY_ID"),
@@ -6,26 +17,26 @@ def archive_and_upload(app_platform)
     key_content: key,
     is_key_content_base64: !key.include?("PRIVATE KEY")
   )
-
-  build_app(
-    project: "build/AmneziaVPN.xcodeproj",
-    scheme: "AmneziaVPN",
-    configuration: "Release",
-    export_method: "app-store",
-    output_directory: "build/#{app_platform}"
-  )
-
-  upload_to_testflight(app_platform: app_platform, skip_waiting_for_build_processing: true)
 end
 
 platform :ios do
+  lane :archive do
+    archive_build("ios")
+  end
+
   lane :testflight_upload do
-    archive_and_upload("ios")
+    authorize_app_store_connect
+    upload_to_testflight(ipa: "build/ios/AmneziaVPN.ipa", skip_waiting_for_build_processing: true)
   end
 end
 
 platform :mac do
+  lane :archive do
+    archive_build("osx")
+  end
+
   lane :testflight_upload do
-    archive_and_upload("osx")
+    authorize_app_store_connect
+    upload_to_testflight(app_platform: "osx", pkg: "build/osx/AmneziaVPN.pkg", skip_waiting_for_build_processing: true)
   end
 end