Skip to content

Commit

Permalink
Merge pull request #49 from 417-72KI/update-versions
Browse files Browse the repository at this point in the history
Update version matrix for macOS 12 runner
  • Loading branch information
417-72KI authored Sep 16, 2023
2 parents 1d5dd96 + c0b3df9 commit a95b16b
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 14 deletions.
7 changes: 7 additions & 0 deletions .github/matrix.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"xcode_version": [
"13.2.1",
"13.4.1",
"14.2"
]
}
6 changes: 3 additions & 3 deletions .github/workflows/demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:
- uses: actions/checkout@v3
- id: extract-xcode-version
run: |
latest_xcode_version=$(cat versions.json | jq -r '.xcode_version | max')
echo "::set-output name=latest_xcode_version::$latest_xcode_version"
latest_xcode_version=$(cat .github/matrix.json | jq -r '.xcode_version | max')
echo "latest_xcode_version=$latest_xcode_version" >> $GITHUB_OUTPUT
test:
name: Test
needs: xcode-version
Expand All @@ -37,7 +37,7 @@ jobs:
id: test
run: |
platform=$(echo '${{ matrix.destination }}' | sed -E 's/platform=(.*)(,name=.*)/\1/g' | tr ' ' '_')
echo "::set-output name=platform::$platform"
echo "platform=$platform" >> $GITHUB_OUTPUT
defaults write com.apple.dt.XCBuild EnableSwiftBuildSystemIntegration 1
cd DemoApp/MockUserDefaultsDemoLib
xcrun xcodebuild \
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- '**.h'
- '**.m'
- '.github/workflows/test.yml'
- 'versions.json'
- '.github/matrix.json'
concurrency:
group: ${{ github.ref }}
cancel-in-progress: true
Expand All @@ -21,8 +21,8 @@ jobs:
- uses: actions/checkout@v3
- id: set-matrix
run: |
echo "::set-output name=matrix::$(cat versions.json | jq -c .)"
echo "::set-output name=latest-xcode-version::$(cat versions.json | jq -rc '.xcode_version | max')"
echo "matrix=$(cat .github/matrix.json | jq -c .)" >> $GITHUB_OUTPUT
echo "latest-xcode-version=$(cat .github/matrix.json | jq -rc '.xcode_version | max')" >> $GITHUB_OUTPUT
xcodebuild:
name: via xcodebuild
needs: generate-matrix
Expand All @@ -35,7 +35,7 @@ jobs:
- 'platform=macOS,variant=Mac Catalyst'
- 'platform=iOS Simulator,name=iPhone 11 Pro'
- 'platform=tvOS Simulator,name=Apple TV'
- 'platform=watchOS Simulator,name=Apple Watch Series 4 - 40mm'
- 'platform=watchOS Simulator,name=Apple Watch Series 5 (40mm)'
env:
DEVELOPER_DIR: /Applications/Xcode_${{ needs.generate-matrix.outputs.latest-xcode-version }}.app/Contents/Developer
steps:
Expand All @@ -44,7 +44,7 @@ jobs:
id: test
run: |
platform=$(echo '${{ matrix.destination }}' | sed -E 's/platform=(.*)(,name=.*)/\1/g' | tr ' ' '_')
echo "::set-output name=platform::$platform"
echo "platform=$platform" >> $GITHUB_OUTPUT
defaults write com.apple.dt.XCBuild EnableSwiftBuildSystemIntegration 1
xcrun xcodebuild \
-enableCodeCoverage=YES \
Expand Down
6 changes: 0 additions & 6 deletions versions.json

This file was deleted.

0 comments on commit a95b16b

Please sign in to comment.