Skip to content

Commit 8c0fa23

Browse files
committed
Merge branch 'release/2.0.2'
# Conflicts: # package-lock.json # package.json
2 parents 5b827dd + cf33905 commit 8c0fa23

12 files changed

+8427
-8302
lines changed

.github/workflows/tests.yml

+17-3
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,24 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
operating-system: [macos-latest]
22-
xcode-version: ["10.0", "10.3", "11.0", "11.5", "12.0.1", "12.4"]
21+
operating-system: ["macos-11", "macos-12"]
22+
xcode-version: ["13.1", "13.2.1", "13.4"]
23+
include:
24+
- operating-system: "macos-10.15"
25+
xcode-version: "11.0"
26+
- operating-system: "macos-10.15"
27+
xcode-version: "11.5"
28+
- operating-system: "macos-10.15"
29+
xcode-version: "12.0.1"
30+
- operating-system: "macos-10.15"
31+
xcode-version: "12.4"
32+
- operating-system: "macos-11"
33+
xcode-version: "12.0.1"
34+
exclude:
35+
- operating-system: "macos-11"
36+
xcode-version: "13.4"
2337
steps:
24-
- uses: actions/checkout@v2
38+
- uses: actions/checkout@v3
2539
- uses: ./
2640
with:
2741
xcode-version: ${{ matrix.xcode-version }}

.github/workflows/units.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ jobs:
1818
units:
1919
runs-on: macos-latest
2020
steps:
21-
- uses: actions/checkout@v2
22-
- uses: actions/setup-node@v2
21+
- uses: actions/checkout@master
22+
- uses: actions/setup-node@master
2323
with:
2424
node-version: '12'
2525
- run: npm ci

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ steps:
1818
- uses: actions/checkout@master
1919
- uses: sinoru/actions-setup-xcode@v2
2020
with:
21-
xcode-version: '11.2.1' # Exact version of a Xcode version to use
21+
xcode-version: '13.4' # Exact version of a Xcode version to use
2222
apple-id: '[email protected]' # Apple ID to download from Apple Developer when Xcode not available in local
2323
apple-id-password: ${{ secrets.APPLE_ID_PASSWORD }}
2424
- run: fastlane scan

0 commit comments

Comments
 (0)