Merge pull request #4640 from opengisch/backport-4637-to-release-3_0

[Backport release-3_0] Fix iOS release
opengisch · Oct 14, 2023 · 06ba94b · 06ba94b · qfield-fairy · Oct 14, 2023
2 parents ccf18a2 + 37d5fb7
commit 06ba94b
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -15,7 +15,7 @@ jobs:
     name: build (ios)
     runs-on: macos-12
     env:
-      DEPLOYMENT_TARGET: '13.0'
+      DEPLOYMENT_TARGET: '14.0'
       BUILD_TYPE: 'Release'
       TRIPLET: 'arm64-ios'
 
@@ -25,18 +25,31 @@ jobs:
         with:
           submodules: recursive
 
+      - name: 🌾 Prepare vars
+        id: vars
+        shell: bash
+        run: |
+          ./scripts/ci/env_gh.sh
+
       - uses: Apple-Actions/import-codesign-certs@v2
         with:
           p12-file-base64: ${{ env.CI_USE_IOS_DIST_CERT && secrets.APPLE_CODESIGN_CERT_BASE64_DIST || secrets.APPLE_CODESIGN_CERT_BASE64_DEV }}
           p12-password: ${{ env.CI_USE_IOS_DIST_CERT && secrets.APPLE_CODESIGN_CERT_PASS_DIST || secrets.APPLE_CODESIGN_CERT_PASS_DEV }}
 
+      - uses: Apple-Actions/download-provisioning-profiles@v1
+        with:
+          bundle-id: ch.opengis.qfield
+          issuer-id: ${{ secrets.IOS_APPSTORE_ISSUER_ID }}
+          api-key-id: ${{ secrets.IOS_APPSTORE_KEY_ID }}
+          api-private-key: ${{ secrets.IOS_APPSTORE_PRIVATE_KEY }}
+
       - name: 💐 Install Qt
         uses: jurplel/install-qt-action@v3
         with:
           version: 6.5.3
           modules: 'qt5compat qtcharts qtpositioning qtconnectivity qtmultimedia qtwebview qtsensors'
           target: ios
-          cache: false
+          cache: true
 
       - name: 💐 Install Qt
         uses: jurplel/install-qt-action@v3
@@ -45,19 +58,6 @@ jobs:
           target: desktop
           cache: false
 
-      - name: 🌾 Prepare vars
-        id: vars
-        shell: bash
-        run: |
-          ./scripts/ci/env_gh.sh
-
-      - uses: Apple-Actions/download-provisioning-profiles@v1
-        with:
-          bundle-id: ch.opengis.qfield
-          issuer-id: ${{ secrets.IOS_APPSTORE_ISSUER_ID }}
-          api-key-id: ${{ secrets.IOS_APPSTORE_KEY_ID }}
-          api-private-key: ${{ secrets.IOS_APPSTORE_PRIVATE_KEY }}
-
       - name: Prepare ios build env
         run: |
           brew install automake bison flex gnu-sed s3cmd gettext