From 12e8570fcb94126c38a8342c2fccae7a6cadcc43 Mon Sep 17 00:00:00 2001
From: Davide De Rosa <keeshux@gmail.com>
Date: Tue, 5 Oct 2021 11:24:55 +0200
Subject: [PATCH] Split upload and TestFlight jobs

---
 .env.beta                        |  1 +
 .env.ios                         |  2 +-
 .env.mac                         |  2 +-
 .github/workflows/beta.yml       | 59 +++++++++++++++++++++++---------
 .ruby-version                    |  1 +
 Submodules/fastlane-ci-templates |  2 +-
 6 files changed, 47 insertions(+), 20 deletions(-)
 create mode 100644 .ruby-version

diff --git a/.env.beta b/.env.beta
index ea37ca30..0092e42b 100644
--- a/.env.beta
+++ b/.env.beta
@@ -3,5 +3,6 @@ MATCH_TYPE="appstore"
 GYM_EXPORT_METHOD="app-store"
 GYM_SKIP_PACKAGE_PKG="false"
 DEMO_ACCOUNT_REQUIRED="true"
+PILOT_DISTRIBUTE_ONLY="true"
 PILOT_DISTRIBUTE_EXTERNAL="true"
 PILOT_BETA_APP_DESCRIPTION="Passepartout is a non-official, user-friendly OpenVPN® client."
diff --git a/.env.ios b/.env.ios
index d88b94be..c878eb1a 100644
--- a/.env.ios
+++ b/.env.ios
@@ -3,6 +3,6 @@ APP_ROOT="Passepartout/App/iOS"
 MATCH_PLATFORM="ios"
 GYM_SCHEME="Passepartout-iOS"
 DELIVER_PLATFORM="ios"
-PILOT_IPA="$DIST_PATH/$PLATFORM/beta/$APP_NAME.ipa"
+PILOT_PLATFORM="ios"
 APPCENTER_APP_NAME=$GYM_SCHEME
 APPCENTER_DISTRIBUTE_IPA="$DIST_PATH/$PLATFORM/dev/$APP_NAME.ipa"
diff --git a/.env.mac b/.env.mac
index 076fbf0c..4ba7b633 100644
--- a/.env.mac
+++ b/.env.mac
@@ -4,6 +4,6 @@ MATCH_PLATFORM="macos"
 MATCH_ADDITIONAL_CERT_TYPES="mac_installer_distribution"
 GYM_SCHEME="Passepartout-macOS"
 DELIVER_PLATFORM="osx"
-PILOT_PKG="$DIST_PATH/$PLATFORM/beta/$APP_NAME.pkg"
+PILOT_PLATFORM="osx"
 APPCENTER_APP_NAME=$GYM_SCHEME
 APPCENTER_DISTRIBUTE_FILE="$DIST_PATH/$PLATFORM/dev/$APP_NAME.app"
diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
index 7757189a..30ca1168 100644
--- a/.github/workflows/beta.yml
+++ b/.github/workflows/beta.yml
@@ -4,6 +4,7 @@ on:
   push:
     #branches:
     #  - master
+    #  - stable
     tags:
       - 'v*-b*'
     #tags-ignore:
@@ -15,24 +16,19 @@ env:
   APP_STORE_CONNECT_API_KEY_KEY: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY }}
   FASTLANE_USERNAME: ${{ secrets.FASTLANE_USERNAME }}
   FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }}
-  MATCH_USERNAME: ${{ secrets.MATCH_USERNAME }}
-  MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
-  MATCH_GIT_URL: ${{ secrets.MATCH_GIT_URL }}
-  MATCH_GIT_PRIVATE_KEY: ${{ secrets.MATCH_GIT_PRIVATE_KEY }}
-  MATCH_KEYCHAIN_NAME: ${{ secrets.MATCH_KEYCHAIN_NAME }}
-  MATCH_KEYCHAIN_PASSWORD: ${{ secrets.MATCH_KEYCHAIN_PASSWORD }}
-  DELIVER_USERNAME: ${{ secrets.DELIVER_USERNAME }}
-  PILOT_USERNAME: ${{ secrets.PILOT_USERNAME }}
-  PILOT_GROUPS: ${{ secrets.PILOT_GROUPS }}
-  PILOT_BETA_APP_FEEDBACK: ${{ secrets.PILOT_BETA_APP_FEEDBACK }}
-  PILOT_BETA_APP_REVIEW_INFO: ${{ secrets.PILOT_BETA_APP_REVIEW_INFO }}
-  APPCENTER_OWNER_NAME: ${{ secrets.APPCENTER_OWNER_NAME }}
-  APPCENTER_API_TOKEN: ${{ secrets.APPCENTER_API_TOKEN }}
 
 jobs:
-  upload_to_testflight:
+  upload_to_app_store:
     runs-on: macos-10.15
     timeout-minutes: 60
+    env:
+      MATCH_USERNAME: ${{ secrets.MATCH_USERNAME }}
+      MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
+      MATCH_GIT_URL: ${{ secrets.MATCH_GIT_URL }}
+      MATCH_GIT_PRIVATE_KEY: ${{ secrets.MATCH_GIT_PRIVATE_KEY }}
+      MATCH_KEYCHAIN_NAME: ${{ secrets.MATCH_KEYCHAIN_NAME }}
+      MATCH_KEYCHAIN_PASSWORD: ${{ secrets.MATCH_KEYCHAIN_PASSWORD }}
+      DELIVER_USERNAME: ${{ secrets.DELIVER_USERNAME }}
     steps:
       - name: Check out repository
         uses: actions/checkout@v2
@@ -42,7 +38,6 @@ jobs:
       - name: Prepare Ruby bundle
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
           bundler-cache: true
       - name: Select Xcode version
         uses: maxim-lobanov/setup-xcode@v1
@@ -68,9 +63,39 @@ jobs:
         run: |
           bundle exec fastlane --env ios,beta create_archive
           scripts/ci/reset-archive.sh
+      - name: Upload to App Store (macOS)
+        run: |
+          bundle exec fastlane --env mac,beta store_deploy
+      - name: Upload to App Store (iOS)
+        run: |
+          bundle exec fastlane --env ios,beta store_deploy
+  submit_to_testflight:
+    runs-on: macos-10.15
+    needs: upload_to_app_store
+    environment:
+      name: testflight
+    env:
+      PILOT_USERNAME: ${{ secrets.PILOT_USERNAME }}
+      PILOT_GROUPS: ${{ secrets.PILOT_GROUPS }}
+      PILOT_BETA_APP_FEEDBACK: ${{ secrets.PILOT_BETA_APP_FEEDBACK }}
+      PILOT_BETA_APP_REVIEW_INFO: ${{ secrets.PILOT_BETA_APP_REVIEW_INFO }}
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          submodules: true
+      - name: Prepare Ruby bundle
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
       - name: Submit to TestFlight (macOS)
         run: |
-          PILOT_CHANGELOG=`ci/build-changelog.sh mac` bundle exec fastlane --env mac,beta beta_deploy
+          export PILOT_CHANGELOG=`ci/build-changelog.sh mac`
+          export PILOT_BUILD_NUMBER=`ci/build-number.sh`
+          bundle exec fastlane --env mac,beta beta_deploy
       - name: Submit to TestFlight (iOS)
         run: |
-          PILOT_CHANGELOG=`ci/build-changelog.sh ios` bundle exec fastlane --env ios,beta beta_deploy
+          export PILOT_CHANGELOG=`ci/build-changelog.sh ios`
+          export PILOT_BUILD_NUMBER=`ci/build-number.sh`
+          bundle exec fastlane --env ios,beta beta_deploy
diff --git a/.ruby-version b/.ruby-version
new file mode 100644
index 00000000..1effb003
--- /dev/null
+++ b/.ruby-version
@@ -0,0 +1 @@
+2.7
diff --git a/Submodules/fastlane-ci-templates b/Submodules/fastlane-ci-templates
index 945f273a..7b09e281 160000
--- a/Submodules/fastlane-ci-templates
+++ b/Submodules/fastlane-ci-templates
@@ -1 +1 @@
-Subproject commit 945f273a3d4fd24d3d2e9cf401d42c354946714a
+Subproject commit 7b09e281671032e6b1460a51b101e9060f907624