Skip to content
This repository has been archived by the owner on Feb 28, 2024. It is now read-only.

Commit

Permalink
Merge pull request #7 from joseph-neeraj/fix/github-actions
Browse files Browse the repository at this point in the history
Fix failing github actions
  • Loading branch information
joseph-neeraj committed May 10, 2023
2 parents 21f5a88 + f2d0d08 commit a042e68
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
11 changes: 7 additions & 4 deletions .github/workflows/sonar.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Sonar
env:
DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
'on':
push:
branches:
Expand All @@ -14,9 +14,12 @@ env:
workflow_dispatch:
jobs:
build:
runs-on: macos-latest
runs-on: macos-12
steps:
- uses: actions/checkout@v2
- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '14.2.0'
- name: Check for external PR
if: ${{ !(contains(github.event.pull_request.labels.*.name, 'safe') ||
github.event.pull_request.head.repo.full_name == github.repository ||
Expand All @@ -35,7 +38,7 @@ jobs:
run: >
set -o pipefail && xcodebuild -workspace
MastercardOAuth1Signer.xcworkspace -scheme MastercardOAuth1Signer
-destination 'platform=iOS Simulator,OS=14.4,name=iPhone 11'
-destination 'platform=iOS Simulator,OS=16.2,name=iPhone 11'
-derivedDataPath Build/ -enableCodeCoverage YES clean build test
CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED="NO" ONLY_ACTIVE_ARCH=NO |
xcpretty
Expand All @@ -53,7 +56,7 @@ jobs:
-Dsonar.projectKey=Mastercard_oauth1-signer-swift -Dsonar.sources=.
-Dsonar.swift.xcworkspace=MastercardOAuth1Signer.xcworkspace
-Dsonar.swift.scheme=MastercardOAuth1Signer
-Dsonar.swift.simulator="platform=iOS Simulator,OS=14.4,name=iPhone
-Dsonar.swift.simulator="platform=iOS Simulator,OS=16.2,name=iPhone
11" -Dsonar.cfamily.build-wrapper-output.bypass=true
-Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN
-Dsonar.coverageReportPaths=coverage.xml
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Build & Test
env:
DEVELOPER_DIR: /Applications/Xcode_13.0.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
'on':
push:
branches:
Expand All @@ -13,17 +13,20 @@ env:
workflow_dispatch:
jobs:
build:
runs-on: macos-latest
runs-on: macos-12
steps:
- uses: actions/checkout@v2
- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '14.2.0'
- name: Install Dependencies
run: |
pod install
- name: Run tests
run: >
set -o pipefail && xcodebuild -workspace
MastercardOAuth1Signer.xcworkspace -scheme MastercardOAuth1Signer
-destination 'platform=iOS Simulator,OS=14.4,name=iPhone 11'
-destination 'platform=iOS Simulator,OS=16.2,name=iPhone 11'
-derivedDataPath Build/ -enableCodeCoverage YES clean build test
CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED="NO" ONLY_ACTIVE_ARCH=NO |
xcpretty

0 comments on commit a042e68

Please sign in to comment.