Add job for public beta deployment (#600)

Closes #599

.github/workflows/release.yml

@@ -22,26 +22,13 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        #name: ["iOS", "macOS", "tvOS"]
+        #platform: ["iOS", "macOS", "tvOS"]
-        name: ["iOS", "macOS"]
+        platform: ["iOS", "macOS"]
-        include:
-          - name: "iOS"
-            platform: "ios"
-          - name: "macOS"
-            platform: "macos"
-          #- name: "tvOS"
-          #  platform: "tvos"
     steps:
-      - uses: actions/checkout@v4
+      - uses: passepartoutvpn/action-prepare-xcode-build@master
-      - uses: ruby/setup-ruby@v1
         with:
-          bundler-cache: true
+          access_token: ${{ secrets.ACCESS_TOKEN }}
-      - name: Access private repositories
+      - name: Upload ${{ matrix.platform }} app
-        env:
-          ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
-        run: |
-          git config --global url.https://$ACCESS_TOKEN@github.com/.insteadOf git@github.com:
-      - name: Upload ${{ matrix.name }} app
         id: upload_app
         timeout-minutes: 15
         env:
@@ -55,3 +42,22 @@ jobs:
         run: |
           ci/recognize-match-hostname.sh
           bundle exec fastlane --env ${{ matrix.platform }} beta
+  distribute_public_beta:
+    name: Distribute Public Beta
+    runs-on: ubuntu-latest
+    needs: build_upload
+    environment:
+      name: public_beta
+      url: "https://testflight.apple.com/join/K71mtLjZ"
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - name: Publish on TestFlight
+        run: |
+          #PLATFORMS=("iOS" "macOS" "tvOS")
+          PLATFORMS=("iOS" "macOS")
+          for PLATFORM in ${PLATFORMS[@]}; do
+            bundle exec fastlane --env $PLATFORM public_beta
+          done

.github/workflows/test.yml

@@ -20,18 +20,9 @@ jobs:
     runs-on: macos-14
     timeout-minutes: 15
     steps:
-      - uses: actions/checkout@v4
+      - uses: passepartoutvpn/action-prepare-xcode-build@master
-      - uses: ruby/setup-ruby@v1
         with:
-          bundler-cache: true
+          access_token: ${{ secrets.ACCESS_TOKEN }}
-      - uses: maxim-lobanov/setup-xcode@v1
-        with:
-          xcode-version: 15.4
-      - name: Access private repositories
-        env:
-          ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
-        run: |
-          git config --global url.https://$ACCESS_TOKEN@github.com/.insteadOf git@github.com:
       - name: Run tests
         run: |
           cd Passepartout/Library

Passepartout/Library/Tests/AppLibraryTests/IssueTests.swift

@@ -38,13 +38,15 @@ final class IssueTests: XCTestCase {
 #endif
     }
 
-    func test_givenAppLine_whenCreateIssue_thenCollectsAppOSAndDevice() {
+    func test_givenAppLine_whenCreateIssue_thenCollectsAppLine() {
-        let issue = Issue(appLine: "Passepartout 1.2.3", purchasedProducts: [])
+        let appLine = "Passepartout 1.2.3"
-        XCTAssertEqual(issue.appLine, "Passepartout 1.2.3")
+        let issue = Issue(appLine: appLine, purchasedProducts: [])
+        XCTAssertEqual(issue.appLine, appLine)
     }
 
     func test_givenAppLineAndProducts_whenCreateIssue_thenMatchesTemplate() {
-        let issue = Issue(appLine: "Passepartout 1.2.3", purchasedProducts: [.Features.appleTV])
+        let appLine = "Passepartout 1.2.3"
+        let issue = Issue(appLine: appLine, purchasedProducts: [.Features.appleTV])
         let expected = """
 Hi,
 
@@ -52,7 +54,7 @@ Hi,
 
 --
 
-App: Passepartout 1.2.3
+App: \(issue.appLine ?? "unknown")
 OS: \(issue.osLine)
 Device: \(issue.deviceLine ?? "unknown")
 Provider: none (last updated: unknown)

fastlane/.env

@@ -2,5 +2,6 @@ LC_ALL="en_US.UTF-8"
 LANG="en_US.UTF-8"
 
 GYM_SCHEME="Passepartout"
+FL_VERSION_NUMBER_TARGET="Passepartout"
 FL_BUILD_NUMBER_PROJECT="Passepartout.xcodeproj"
 PILOT_BETA_APP_DESCRIPTION="Passepartout is your go-to app for VPN and privacy."

fastlane/.env.iOS

@@ -2,3 +2,4 @@ MATCH_PLATFORM="ios"
 GYM_SDK="iphoneos"
 GYM_DESTINATION="generic/platform=iOS"
 GYM_OUTPUT_DIRECTORY="dist/ios"
+PILOT_PLATFORM="ios"

fastlane/.env.macOS

@@ -3,3 +3,4 @@ MATCH_ADDITIONAL_CERT_TYPES="mac_installer_distribution"
 GYM_SDK="macosx"
 GYM_DESTINATION="generic/platform=macOS"
 GYM_OUTPUT_DIRECTORY="dist/macos"
+PILOT_PLATFORM="osx"

fastlane/.env.tvOS

@@ -2,3 +2,4 @@ MATCH_PLATFORM="tvos"
 GYM_SDK="appletvos"
 GYM_DESTINATION="generic/platform=tvOS"
 GYM_OUTPUT_DIRECTORY="dist/tvos"
+PILOT_PLATFORM="appletvos"

fastlane/Fastfile

@@ -64,7 +64,11 @@ end
 
 desc "Distribute to Public Beta"
 lane :public_beta do
+    version = get_version_number
+    build = get_build_number
     pilot(
+        app_version: version,
+        build_number: build,
         distribute_only: true,
         distribute_external: true,
         notify_external_testers: true