actions

Author: ncooke3

.github/workflows/common_quickstart.yml

@@ -44,14 +44,6 @@ on:
         type: string
         required: true
 
-      # The type of quickstart to test.
-      #
-      # Options: [swift, objc]
-      quickstart_type:
-        type: string
-        required: false
-        default: objc
-
       # Whether to run tests or just build. Defaults to true.
       run_tests:
         type: boolean
@@ -89,20 +81,21 @@ jobs:
     #         ${{ inputs.plist_src_path }} \
     #         ${{ inputs.plist_dst_path }} \
     #         "$plist_secret"
-    - name: Build ${{ inputs.product }} Quickstart (${{ inputs.quickstart_type }} / ${{ inputs.is_legacy && 'Legacy' || 'Non-Legacy' }})
+    - name: Build ${{ inputs.product }} Quickstart (${{ inputs.is_legacy && 'Legacy' || 'Non-Legacy' }})
       uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
       with:
         timeout_minutes: 15
         max_attempts: 3
         retry_wait_seconds: 120
         command: |
-          SPM=true DIR=${{ inputs.product }} scripts/test_quickstart.sh ${{ inputs.product }} false ${{ inputs.quickstart_type }}
-        # command: |
-        #   scripts/test_quickstart.sh ${{ inputs.product }} false ${{ inputs.quickstart_type }}
-        #   scripts/test_quickstart.sh \
-        #     ${{ inputs.product }} \
-        #     ${{ inputs.run_tests }} \
-        #     ${{ inputs.quickstart_type }}
+          SPM=true DIR=${{ inputs.product }} scripts/test_quickstart.sh ${{ inputs.product }} false
+#        command: |
+#           SPM=true DIR=${{ inputs.product }} scripts/test_quickstart.sh ${{ inputs.product }} ${{ inputs.run_tests }}
+#           scripts/test_quickstart.sh \
+#             ${{ inputs.product }} \
+#             ${{ inputs.run_tests }} \
+#             ${{ inputs.quickstart_type }}
+
     # Failure sequence to upload artifact.
     # - id: lowercase_product
     #   if: ${{ failure() }}

.github/workflows/crashlytics.yml

@@ -48,7 +48,6 @@ jobs:
     with:
       product: Crashlytics
       is_legacy: true
-      quickstart_type: swift
       setup_command: |
         scripts/setup_quickstart.sh crashlytics
         mkdir quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart/Pods/FirebaseCrashlytics

.github/workflows/database.yml

@@ -72,16 +72,12 @@ jobs:
 
   quickstart:
     uses: ./.github/workflows/common_quickstart.yml
-    strategy:
-      matrix:
-        quickstart_type: [objc, swift]
     with:
       product: Database
       is_legacy: false
       setup_command: QUICKSTART_BRANCH=mc/spm scripts/setup_quickstart_spm.sh database
       plist_src_path: scripts/gha-encrypted/qs-database.plist.gpg
       plist_dst_path: quickstart-ios/database/GoogleService-Info.plist
-      quickstart_type: ${{ matrix.quickstart_type }}
       run_tests: false
     secrets:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}

.github/workflows/inappmessaging.yml

@@ -74,13 +74,9 @@ jobs:
 
   quickstart:
     uses: ./.github/workflows/common_quickstart.yml
-    strategy:
-      matrix:
-        quickstart_type: [objc, swift]
     with:
       product: InAppMessaging
       is_legacy: false
-      quickstart_type: ${{ matrix.quickstart_type }}
       setup_command: QUICKSTART_BRANCH=mc/spm scripts/setup_quickstart_spm.sh inappmessaging
       plist_src_path: scripts/gha-encrypted/qs-inappmessaging.plist.gpg
       plist_dst_path: quickstart-ios/inappmessaging/GoogleService-Info.plist

.github/workflows/installations.yml

@@ -51,16 +51,12 @@ jobs:
 
   quickstart:
     uses: ./.github/workflows/common_quickstart.yml
-    strategy:
-      matrix:
-        quickstart_type: [objc, swift]
     with:
       product: Installations
       is_legacy: false
       setup_command: QUICKSTART_BRANCH=mc/spm scripts/setup_quickstart_spm.sh installations
       plist_src_path: scripts/gha-encrypted/Installations/GoogleService-Info.plist.gpg
       plist_dst_path: quickstart-ios/installations/GoogleService-Info.plist
-      quickstart_type: ${{ matrix.quickstart_type }}
     secrets:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
 

.github/workflows/messaging.yml

@@ -83,13 +83,9 @@ jobs:
 
   quickstart:
     uses: ./.github/workflows/common_quickstart.yml
-    strategy:
-      matrix:
-        quickstart_type: [objc, swift]
     with:
       product: Messaging
       is_legacy: false
-      quickstart_type: ${{ matrix.quickstart_type }}
       setup_command: QUICKSTART_BRANCH=mc/spm scripts/setup_quickstart_spm.sh messaging
       plist_src_path: scripts/gha-encrypted/qs-messaging.plist.gpg
       plist_dst_path: quickstart-ios/messaging/GoogleService-Info.plist

.github/workflows/performance.yml

@@ -84,7 +84,6 @@ jobs:
     with:
       product: Performance
       is_legacy: false
-      quickstart_type: swift
       setup_command: QUICKSTART_BRANCH=mc/spm scripts/setup_quickstart_spm.sh performance
       plist_src_path: scripts/gha-encrypted/qs-performance.plist.gpg
       plist_dst_path: quickstart-ios/performance/GoogleService-Info.plist

.github/workflows/storage.yml

@@ -83,7 +83,6 @@ jobs:
     uses: ./.github/workflows/common_quickstart.yml
     with:
       product: Storage
-      quickstart_type: swift
       is_legacy: true
       setup_command: QUICKSTART_BRANCH=mc/spm scripts/setup_quickstart_spm.sh storage
       plist_src_path: scripts/gha-encrypted/qs-storage.plist.gpg

scripts/test_quickstart.sh

@@ -20,17 +20,11 @@ set -xeuo pipefail
 
 sample="$1"
 test="$2"
-language="${3-}"
 
 # Source function to check if CI secrets are available.
 source scripts/check_secrets.sh
 
 if check_secrets; then
   cd quickstart-ios
-  if [ "$language" = "swift" ]; then
-    have_secrets=true SAMPLE="$sample" TEST="$test" SWIFT_SUFFIX="Swift" ./scripts/test.sh
-  else
-    have_secrets=true SAMPLE="$sample" TEST="$test" ./scripts/test.sh
-  fi
-
+  have_secrets=true SAMPLE="$sample" TEST="$test" ./scripts/test.sh
 fi