test: test matrix workflow for optional SDKs

.github/actions/sdk-tests/action.yml

@@ -19,6 +19,10 @@ inputs:
  fastlane-session:
  description: Fastlane session
  required: true
+ fastlane-test-lane:
+ description: The fastlane test lane to run
+ required: false
+ default: test_sdk 
  match-keychain-name:
  description: Match keychain name
  required: true
@@ -28,9 +32,13 @@ inputs:
  source-branch:
  description: Source branch
  required: true
- coverage-file-name:
- description: Name of the generic coverage file
- required: true
+ sdk-name:
+ description: The name of the SDK, if running SDK tests
+ required: false
+ package-swift:
+ description: The swift package file to use, if not default
+ required: false
+
 runs:
  using: "composite"
  steps:
@@ -51,10 +59,16 @@ runs:
  with:
  ruby-version: "3.2"
  bundler-cache: true
+ - name: Setup Package.swift
+ shell: bash
+ if: ${{ inputs.package-swift != '' }}
+ run: |
+ mv Package.swift Package.swift.orig
+ cp "${{ inputs.package-swift }}" Package.swift
  - name: Build SPM App
  shell: bash
  run: |
- bundle exec fastlane test_spm
+ bundle exec fastlane ${{ inputs.fastlane-test-lane }}
  env:
  MATCH_PASSWORD: ${{ inputs.match-password }}
  MATCH_GIT_PRIVATE_KEY: ${{ inputs.ssh-private-key }}
@@ -63,19 +77,13 @@ runs:
  MATCH_KEYCHAIN_NAME: ${{ inputs.match-keychain-name }}
  MATCH_KEYCHAIN_PASSWORD: ${{ inputs.match-password }}
  SOURCE_BRANCH: ${{ inputs.source-branch }}
- - name: Archive log
- uses: actions/upload-artifact@v4
- if: always()
- with:
- name: fastlane-logs
- path: /Users/runner/Library/Logs/scan/PrimerSDKTests.log
- retention-days: 1
  - name: Prepare coverage reports
  shell: bash
+ if: ${{ inputs.sdk-name != '' }}
  run: |
  bash Scripts/xccov-to-sonarqube-generic.sh fastlane/test_output/PrimerSDKTests.xcresult/ > coverage.xml
- sed "s#$PWD/##g" coverage.xml > ${{ inputs.coverage-file-name }}
+ sed "s#$PWD/##g" coverage.xml > sonar-coverage-${{ inputs.sdk-name }}.xml
  - uses: actions/upload-artifact@master
  with:
- name: coverage-file
- path: ${{ inputs.coverage-file-name }}
+ name: coverage-file-${{ inputs.sdk-name }}
+ path: sonar-coverage-${{ inputs.sdk-name }}.xml

.github/actions/sonar/action.yml

@@ -10,7 +10,7 @@ inputs:
  sonar-host:
  description: Sonar host URL
  required: true
- coverage-file-name:
+ coverage-file-names:
  description: Name of the generic coverage file
  required: true
  branch:
@@ -29,9 +29,9 @@ inputs:
 runs:
  using: "composite"
  steps:
- - uses: actions/download-artifact@master
+ - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e #v4.1.7
  with:
- name: coverage-file
+ pattern: coverage-file-*
  - name: Install Sonar
  shell: bash
  run: |
@@ -43,7 +43,7 @@ runs:
  echo "sonar.pullrequest.branch=${{ inputs.branch }}" >> sonar-project.properties
  echo "sonar.pullrequest.base=${{ inputs.base-branch }}" >> sonar-project.properties
  echo "sonar.scm.revision=${{ inputs.pull-request-sha }}" >> sonar-project.properties
- echo "sonar.coverageReportPaths=${{ inputs.coverage-file-name }}" >> sonar-project.properties
+ echo "sonar.coverageReportPaths=${{ inputs.coverage-file-names }}" >> sonar-project.properties
  - name: Run Sonar
  shell: bash
  run: |

.github/workflows/build-test-upload.yml

@@ -11,10 +11,10 @@ concurrency:
  cancel-in-progress: true
 
 jobs:
- unit-tests:
+ unit-tests-sdk:
  runs-on: macos-13-large
  timeout-minutes: 20
- name: "Unit Tests"
+ name: "Unit Tests - SDK"
  steps:
  - name: Cancel previous jobs
  uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # v0.12.1
@@ -35,20 +35,81 @@ jobs:
  fastlane-password: ${{ secrets.FASTLANE_PASSWORD }}
  match-keychain-name: ${{ secrets.MATCH_KEYCHAIN_NAME }}
  match-keychain-password: ${{ secrets.MATCH_KEYCHAIN_PASSWORD }}
- coverage-file-name: sonar-coverage.xml
+ sdk-name: sdk
+
+ optional-sdk-tests:
+ name: Optional SDK Tests
+ runs-on: macos-13-large
+ strategy:
+ max-parallel: 3
+ matrix:
+ package-swift:
+ - { name: 'nol-pay', file: 'Package.NolPay.swift' }
+ - { name: 'klarna', file: Package.Klarna.swift }
+ - { name: '3DS', file: Package.3DS.swift }
+ steps:
+ - name: Cancel previous jobs
+ uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # v0.12.1
+ with:
+ access_token: ${{ github.token }}
+ - name: Git - Checkout
+ uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+ with:
+ ref: ${{ github.ref }}
+ - name: Run SDK tests
+ uses: ./.github/actions/sdk-tests
+ with:
+ ssh-private-key: ${{ secrets.SSH_KEY }}
+ known-hosts: ${{ secrets.KNOWN_HOSTS }}
+ match-password: ${{ secrets.MATCH_PASSWORD }}
+ match-git-private-key: ${{ secrets.FASTLANE_PASSWORD }}
+ fastlane-session: ${{ secrets.FASTLANE_SESSION }}
+ fastlane-password: ${{ secrets.FASTLANE_PASSWORD }}
+ match-keychain-name: ${{ secrets.MATCH_KEYCHAIN_NAME }}
+ match-keychain-password: ${{ secrets.MATCH_KEYCHAIN_PASSWORD }}
+ sdk-name: ${{ matrix.package-swift.name }}
+ package-swift: ${{ matrix.package-swift.file }}
+
+ unit-tests-debug-app:
+ runs-on: macos-13-large
+ timeout-minutes: 20
+ name: "Unit Tests - Debug App"
+ steps:
+ - name: Cancel previous jobs
+ uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # v0.12.1
+ with:
+ access_token: ${{ github.token }}
+ - name: Git - Checkout
+ uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+ with:
+ ref: ${{ github.ref }}
+ - name: Run debug app tests
+ uses: ./.github/actions/sdk-tests
+ with:
+ ssh-private-key: ${{ secrets.SSH_KEY }}
+ known-hosts: ${{ secrets.KNOWN_HOSTS }}
+ match-password: ${{ secrets.MATCH_PASSWORD }}
+ match-git-private-key: ${{ secrets.FASTLANE_PASSWORD }}
+ fastlane-session: ${{ secrets.FASTLANE_SESSION }}
+ fastlane-password: ${{ secrets.FASTLANE_PASSWORD }}
+ match-keychain-name: ${{ secrets.MATCH_KEYCHAIN_NAME }}
+ match-keychain-password: ${{ secrets.MATCH_KEYCHAIN_PASSWORD }}
+ fastlane-test-lane: test_debug_app
 
  sonarcloud:
  needs:
- - unit-tests
+ - unit-tests-sdk
+ - optional-sdk-tests
  name: SonarCloud
  runs-on: macos-13
  steps:
  - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
  with:
  fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- - uses: actions/download-artifact@master
+ - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e #v4.1.7
  with:
- name: coverage-file
+ pattern: coverage-file-*
+ - run: mv coverage-file-*/sonar-coverage-*.xml ./
  - name: SonarCloud Scan
  uses: ./.github/actions/sonar
  with:
@@ -59,11 +120,12 @@ jobs:
  branch: ${{ github.head_ref }}
  base-branch: ${{ github.base_ref }}
  pull-request-sha: ${{ github.event.pull_request.head.sha }}
- coverage-file-name: sonar-coverage.xml
+ coverage-file-names: sonar-coverage-sdk.xml,sonar-coverage-3DS.xml,sonar-coverage-nol-pay.xml,sonar-coverage-klarna.xml
 
  build-and-upload-to-appetize:
  needs:
- - unit-tests
+ - unit-tests-sdk
+ - unit-tests-debug-app
  runs-on: macos-13-large
  timeout-minutes: 45
  name: "Build and upload app to Appetize"

.github/workflows/test-and-code-quality.yml

@@ -35,7 +35,6 @@ jobs:
  fastlane-password: ${{ secrets.FASTLANE_PASSWORD }}
  match-keychain-name: ${{ secrets.MATCH_KEYCHAIN_NAME }}
  match-keychain-password: ${{ secrets.MATCH_KEYCHAIN_PASSWORD }}
- coverage-file-name: sonar-coverage.xml
 
  sonarcloud:
  needs:
@@ -46,14 +45,14 @@ jobs:
  - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
  with:
  fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- - uses: actions/download-artifact@master
+ - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e #v4.1.7
  with:
- name: coverage-file
+ name: coverage-file-sdk
  - name: SonarCloud Scan
  uses: ./.github/actions/sonar
  with:
  github-token: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
  sonar-token: ${{ secrets.SONAR_TOKEN }}
  sonar-host: https://sonarcloud.io./
  branch: ${{ github.head_ref }}
- coverage-file-name: sonar-coverage.xml
+ coverage-file-names: sonar-coverage-sdk.xml

.github/workflows/xcode-versions-build.yml

@@ -15,8 +15,11 @@ jobs:
  strategy:
  max-parallel: 3
  matrix:
- variant: [cocoapods, spm]
- xcode: [14.3.1]
+ variant: 
+ - cocoapods
+ - spm
+ xcode: 
+ - 14.3.1
  steps:
  - name: Git - Checkout
  uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6

.gitignore

@@ -57,7 +57,7 @@ playground.xcworkspace
 # .swiftpm
 
 .build/
-
+Package.swift.orig
 
 # CocoaPods
 #

.swiftpm/xcode/xcshareddata/xcschemes/PrimerSDKTests.xcscheme

@@ -17,6 +17,16 @@
  reference = "container:Debug App/Tests/UnitTestsTestPlan.xctestplan">
  </TestPlanReference>
  </BuildActionEntry>
+ <BuildActionEntry
+ buildForTesting = "YES"
+ buildForRunning = "YES"
+ buildForProfiling = "NO"
+ buildForArchiving = "NO"
+ buildForAnalyzing = "NO">
+ <TestPlanReference
+ reference = "container:Debug App/Tests/DebugAppTestPlan.xctestplan">
+ </TestPlanReference>
+ </BuildActionEntry>
  </BuildActionEntries>
  </BuildAction>
  <TestAction
@@ -30,23 +40,11 @@
  default = "YES">
  </TestPlanReference>
  </TestPlans>
- <Testables>
- <TestableReference
- skipped = "NO">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "PrimerSDKTests"
- BuildableName = "PrimerSDKTests"
- BlueprintName = "PrimerSDKTests"
- ReferencedContainer = "container:">
- </BuildableReference>
- </TestableReference>
- </Testables>
  </TestAction>
  <LaunchAction
  buildConfiguration = "Debug"
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ selectedDebuggerIdentifier = ""
+ selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
  launchStyle = "0"
  useCustomWorkingDirectory = "NO"
  ignoresPersistentStateOnLaunch = "NO"
@@ -60,6 +58,15 @@
  savedToolIdentifier = ""
  useCustomWorkingDirectory = "NO"
  debugDocumentVersioning = "YES">
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "Tests"
+ BuildableName = "Tests"
+ BlueprintName = "Tests"
+ ReferencedContainer = "container:">
+ </BuildableReference>
+ </MacroExpansion>
  </ProfileAction>
  <AnalyzeAction
  buildConfiguration = "Debug">