Skip to content

Commit b1d5ab1

Browse files
chore: Cherry-picked changes from upstream
Signed-off-by: Anurag Rajawat <anurag@stepsecurity.io>
1 parent ce8c186 commit b1d5ab1

4 files changed

Lines changed: 55 additions & 47 deletions

File tree

.github/workflows/e2e.yml

Lines changed: 19 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,40 +5,28 @@ on:
55
- main
66
pull_request:
77

8-
jobs:
9-
versions-macOS-15:
10-
name: macOS 15
11-
runs-on: macos-15
12-
strategy:
13-
matrix:
14-
xcode-version: ['16.0', '16.4', '26.0.1', '26.2', latest, latest-stable]
15-
fail-fast: false
16-
steps:
17-
- name: Harden the runner (Audit all outbound calls)
18-
uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
19-
with:
20-
egress-policy: audit
21-
22-
- name: Checkout
23-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
8+
permissions:
9+
contents: read
2410

25-
- uses: ./
26-
name: Setup Xcode
27-
id: setup-xcode
28-
with:
29-
xcode-version: ${{ matrix.xcode-version }}
30-
- name: Print output variables
31-
run: |
32-
echo "Version: ${{ steps.setup-xcode.outputs.version }}"
33-
echo "Path: ${{ steps.setup-xcode.outputs.path }}"
34-
35-
versions-macOS-14:
36-
name: macOS 14
37-
runs-on: macos-14
11+
jobs:
12+
versions:
13+
name: ${{ matrix.runner }} / ${{ matrix.xcode-version }}
14+
runs-on: ${{ matrix.runner }}
3815
strategy:
3916
matrix:
40-
# https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md#xcode
41-
xcode-version: ['16.2', '15.2', '15.3', latest, latest-stable]
17+
runner: [macos-15, macos-26]
18+
xcode-version: [latest, latest-stable]
19+
include:
20+
# https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md#xcode
21+
- runner: macos-15
22+
xcode-version: '16.2'
23+
- runner: macos-15
24+
xcode-version: '16.4'
25+
# https://github.com/actions/runner-images/blob/main/images/macos/macos-26-Readme.md#xcode
26+
- runner: macos-26
27+
xcode-version: '26.2'
28+
- runner: macos-26
29+
xcode-version: '26.3'
4230
fail-fast: false
4331
steps:
4432
- name: Harden the runner (Audit all outbound calls)

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ The list of all available versions can be found in [runner-images](https://githu
1313
**Notes:**
1414
- `latest-stable` points to the latest stable version of Xcode
1515
- `latest` *includes* beta releases that GitHub actions has installed
16-
- SemVer examples: `14`, `14.1`, `14.3.1`, `^14.3.0` (find more examples in [SemVer cheatsheet](https://devhints.io/semver))
16+
- SemVer examples: `16`, `16.4`, `26.3`, `^16.2.0` (find more examples in [SemVer cheatsheet](https://devhints.io/semver))
1717
- `-beta` suffix after SemVer will only select among beta releases that GitHub actions has installed
1818
- If sets a specific version, wraps it to single quotes in YAML like `'12.0'` to pass it as string because GitHub trimmes trailing `.0` from numbers
1919

@@ -45,22 +45,22 @@ Set the specific stable version of Xcode:
4545
```
4646
jobs:
4747
build:
48-
runs-on: macos-13
48+
runs-on: macos-15
4949
steps:
5050
- uses: step-security/setup-xcode@v1
5151
with:
52-
xcode-version: '14.3.1'
52+
xcode-version: '16.4'
5353
```
5454

55-
Set the specific beta version of Xcode:
55+
Set a specific Xcode version on `macos-26`:
5656
```
5757
jobs:
5858
build:
59-
runs-on: macos-13
59+
runs-on: macos-26
6060
steps:
6161
- uses: step-security/setup-xcode@v1
6262
with:
63-
xcode-version: '15.0-beta'
63+
xcode-version: '26.3'
6464
```
6565
# License
6666
The scripts and documentation in this project are released under the [MIT License](LICENSE)

package-lock.json

Lines changed: 29 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
"devDependencies": {
3232
"@types/jest": "^29.5.5",
33-
"@types/node": "^20.6.3",
33+
"@types/node": "^24.0.0",
3434
"@types/plist": "^3.0.2",
3535
"@types/semver": "^7.5.2",
3636
"@typescript-eslint/eslint-plugin": "^6.7.2",

0 commit comments

Comments
 (0)