Fix deploy action (#24)

.github/workflows/deploy.yml

@@ -12,7 +12,21 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+      - name: Setup GoogleService-Info.plist
+        run: |
+          mkdir -p "Friendly Competitions/Firebase/Release"
+          echo $GOOGLE_SERVICE_INFO_RELEASE > "Friendly Competitions/Firebase/Release/GoogleService-Info.plist"
+        env:
+          GOOGLE_SERVICE_INFO_RELEASE: ${{ secrets.GOOGLE_SERVICE_INFO_RELEASE }}
       - name: Homebrew
         run: brew bundle
+
+      # https://docs.fastlane.tools/getting-started/ios/authentication/
       - name: Deploy
-        run: fastlane release
+        run: fastlane deploy
+        env:
+          APP_STORE_CONNECT_API_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ID }}
+          APP_STORE_CONNECT_API_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_ISSUER_ID }}
+          APP_STORE_CONNECT_API_KEY_CONTENT: ${{ secrets.APP_STORE_CONNECT_API_KEY_CONTENT }}
+          MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }}
+          MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}

.github/workflows/test.yml

@@ -2,7 +2,7 @@ name: Run unit tests
 
 on:
   pull_request:
-    branches: [ main ]
+    branches: [main, release/*]
 
 jobs:
   build:
@@ -14,6 +14,12 @@ jobs:
         uses: actions/checkout@v2
       - name: Restore build cache
         uses: mikehardy/buildcache-action@v1
+      - name: Setup GoogleService-Info.plist
+        run: |
+          mkdir -p "Friendly Competitions/Firebase/Debug"
+          echo $GOOGLE_SERVICE_INFO_DEBUG > "Friendly Competitions/Firebase/Debug/GoogleService-Info.plist"
+        env:
+          GOOGLE_SERVICE_INFO_DEBUG: ${{ secrets.GOOGLE_SERVICE_INFO_DEBUG }}
       - name: Homebrew
         run: brew bundle
       - name: Test

Friendly Competitions.xcodeproj/project.pbxproj

@@ -43,10 +43,10 @@
 		C132336927BECCA800196D81 /* AttributedText.swift in Sources */ = {isa = PBXBuildFile; fileRef = C132336827BECCA800196D81 /* AttributedText.swift */; };
 		C132336B27BF0AF700196D81 /* Sticker.swift in Sources */ = {isa = PBXBuildFile; fileRef = C132336A27BF0AF700196D81 /* Sticker.swift */; };
 		C132336D27BF0C0F00196D81 /* View+CornerRadius.swift in Sources */ = {isa = PBXBuildFile; fileRef = C132336C27BF0C0F00196D81 /* View+CornerRadius.swift */; };
+		C132944A27DAB12200117548 /* DeepLinkTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C132944927DAB12200117548 /* DeepLinkTests.swift */; };
 		C132945227DB8DF000117548 /* ImageAsset+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C132945127DB8DF000117548 /* ImageAsset+Extensions.swift */; };
 		C132945627DF6D9E00117548 /* Binding+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C132945527DF6D9E00117548 /* Binding+Extensions.swift */; };
 		C132945827DF703C00117548 /* Publisher+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C132945727DF703C00117548 /* Publisher+Extensions.swift */; };
-		C132944A27DAB12200117548 /* DeepLinkTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C132944927DAB12200117548 /* DeepLinkTests.swift */; };
 		C1386C7E26D566210096E952 /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = C1386C7D26D566210096E952 /* FirebaseAuth */; };
 		C13F922A27BFFEB500FC6880 /* FirebaseStorage in Frameworks */ = {isa = PBXBuildFile; productRef = C13F922927BFFEB500FC6880 /* FirebaseStorage */; };
 		C13F922C27BFFF9900FC6880 /* StorageManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C13F922B27BFFF9900FC6880 /* StorageManager.swift */; };
@@ -190,10 +190,10 @@
 		C132336827BECCA800196D81 /* AttributedText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttributedText.swift; sourceTree = "<group>"; };
 		C132336A27BF0AF700196D81 /* Sticker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Sticker.swift; sourceTree = "<group>"; };
 		C132336C27BF0C0F00196D81 /* View+CornerRadius.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+CornerRadius.swift"; sourceTree = "<group>"; };
+		C132944927DAB12200117548 /* DeepLinkTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeepLinkTests.swift; sourceTree = "<group>"; };
 		C132945127DB8DF000117548 /* ImageAsset+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ImageAsset+Extensions.swift"; sourceTree = "<group>"; };
 		C132945527DF6D9E00117548 /* Binding+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Binding+Extensions.swift"; sourceTree = "<group>"; };
 		C132945727DF703C00117548 /* Publisher+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Publisher+Extensions.swift"; sourceTree = "<group>"; };
-		C132944927DAB12200117548 /* DeepLinkTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeepLinkTests.swift; sourceTree = "<group>"; };
 		C1386C8126D56CD60096E952 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		C13F922B27BFFF9900FC6880 /* StorageManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StorageManager.swift; sourceTree = "<group>"; };
 		C13F922D27C0017400FC6880 /* FirestoreImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirestoreImage.swift; sourceTree = "<group>"; };

fastlane/Fastfile

@@ -1,40 +1,6 @@
-# This file contains the fastlane.tools configuration
-# You can find the documentation at https://docs.fastlane.tools
-#
-# For a list of all available actions, check out
-#
-#     https://docs.fastlane.tools/actions
-#
-# For a list of all available plugins, check out
-#
-#     https://docs.fastlane.tools/plugins/available-plugins
-#
-
-# Uncomment the line if you want fastlane to automatically update itself
-# update_fastlane
-
-default_platform(:ios)
+default_platform :ios
 
 platform :ios do
-  desc "Push a new release build to the App Store"
-  lane :release do
-    increment_build_number(xcodeproj: "Friendly Competitions.xcodeproj")
-    build_app(scheme: "Friendly Competitions")
-    upload_to_app_store
-  end
-end
-
-lane :test do
-  run_tests(scheme: "Friendly Competitions")
-end
-
-lane :release do |options|
-  match(type: "appstore", readonly: is_ci)
-  build_app(
-    scheme: "Friendly Competitions", 
-    include_bitcode: true
-  )
-  upload_to_app_store(
-    force: true
-  )
+  import "lanes/deploy.rb"
+  import "lanes/test.rb"
 end

fastlane/README.md

@@ -13,34 +13,23 @@ For _fastlane_ installation instructions, see [Installing _fastlane_](https://do
 
 # Available Actions
 
-### test
-
-```sh
-[bundle exec] fastlane test
-```
-
-
+## iOS
 
-### release
+### ios deploy
 
 ```sh
-[bundle exec] fastlane release
+[bundle exec] fastlane ios deploy
 ```
 
 
 
-----
-
-
-## iOS
-
-### ios release
+### ios test
 
 ```sh
-[bundle exec] fastlane ios release
+[bundle exec] fastlane ios test
 ```
 
-Push a new release build to the App Store
+
 
 ----
 

fastlane/lanes/deploy.rb

@@ -0,0 +1,25 @@
+lane :deploy do
+    setup_ci
+    app_store_connect_api_key(
+        key_id: ENV["APP_STORE_CONNECT_API_KEY_ID"],
+        issuer_id: ENV["APP_STORE_CONNECT_API_ISSUER_ID"],
+        key_content: ENV["APP_STORE_CONNECT_API_KEY_CONTENT"],
+        duration: 1200, # optional (maximum 1200)
+        in_house: false # optional but may be required if using match/sigh
+    ) if is_ci
+    match(type: "appstore", readonly: true)
+    increment_build_number(
+        build_number: latest_testflight_build_number + 1
+    )
+    build_app(
+        include_bitcode: true
+    )
+    upload_symbols_to_crashlytics(
+        gsp_path: "Friendly Competitions/Firebase/Release/GoogleService-Info.plist",
+        binary_path: "fastlane/scripts/upload-symbols"
+    )
+    upload_to_app_store(
+        force: true,
+        precheck_include_in_app_purchases: false
+    )
+end

fastlane/lanes/test.rb

@@ -0,0 +1,3 @@
+lane :test do
+    run_tests(scheme: "Friendly Competitions")
+end