Skip to content

Commit afec391

Browse files
authored
Merge pull request #280 from brandonpage/ios-26-github-actions
Fix CI issues
2 parents 981af59 + b4fde96 commit afec391

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

.github/workflows/pr.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ jobs:
6969
lib: ${{ matrix.lib }}
7070
ios: ${{ matrix.ios }}
7171
xcode: ${{ matrix.xcode }}
72-
macos: ${{ matrix.macos }}
7372
is_pr: true
7473
secrets: inherit
7574

@@ -90,7 +89,6 @@ jobs:
9089
lib: ${{ matrix.lib }}
9190
ios: ${{ matrix.ios }}
9291
xcode: ${{ matrix.xcode }}
93-
macos: ${{ matrix.macos }}
9492
action: build
9593
is_pr: true
9694
secrets: inherit

.github/workflows/reusable-workflow.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
workspace: SalesforceMobileSDK-Hybrid.xcworkspace
5454
scheme: ${{ inputs.lib }}
5555
action: ${{ inputs.action }}
56-
code-coverage: ${{ inputs.action == 'test' && true || false }}
56+
code-coverage: ${{ inputs.action == 'test'}}
5757
verbosity: xcbeautify
5858
- uses: slidoapp/xcresulttool@v3.1.0
5959
with:
@@ -62,10 +62,10 @@ jobs:
6262
show-code-coverage: false
6363
upload-bundles: false
6464
show-passed-tests: false
65-
if: (success() || failure()) && inputs.action == 'test' && ${{ inputs.ios != '^26' }}
65+
if: ${{ inputs.action == 'test' && inputs.ios != '^26' }}
6666
- uses: codecov/codecov-action@v4
6767
with:
6868
flags: ${{ inputs.lib }}
6969
env:
7070
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
71-
if: (success() || failure()) && inputs.action == 'test'
71+
if: inputs.action == 'test'

0 commit comments

Comments
 (0)