Skip to content

Commit f66b39d

Browse files
authored
Merge branch 'master' into feat/supportVisionOS
2 parents d32d6c9 + f875a44 commit f66b39d

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

.github/actions/setup/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ runs:
1515
shell: bash
1616

1717
- name: Set up Ruby
18-
uses: ruby/setup-ruby@250fcd6a742febb1123a77a841497ccaa8b9e939
18+
uses: ruby/setup-ruby@0cde4689ba33c09f1b890c1725572ad96751a3fc # pinned to version v1.178.0
1919
with:
2020
bundler-cache: true
2121
cache-version: 1

.github/workflows/main.yml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,17 @@ concurrency:
1313
cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
1414

1515
jobs:
16+
authorize:
17+
name: Authorize
18+
environment: ${{ github.event.pull_request.head.repo.fork && 'external' || 'internal' }}
19+
runs-on: ubuntu-latest
20+
steps:
21+
- run: true
22+
1623
test:
24+
needs: authorize # Require approval before running on forked pull requests
1725
name: Test on ${{ matrix.platform.os }} using Xcode ${{ matrix.xcode }}
26+
environment: ${{ github.event.pull_request.head.repo.fork && 'external' || 'internal' }}
1827
runs-on: macos-13
1928

2029
env:
@@ -31,7 +40,7 @@ jobs:
3140

3241
steps:
3342
- name: Checkout
34-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
43+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
3544

3645
- name: Set up environment
3746
uses: ./.github/actions/setup
@@ -52,6 +61,8 @@ jobs:
5261
- name: Upload coverage report
5362
if: ${{ matrix.platform.os == 'iOS' }}
5463
uses: codecov/codecov-action@ab904c41d6ece82784817410c45d8b8c02684457
64+
with:
65+
token: ${{ secrets.CODECOV_TOKEN }}
5566

5667
test-package:
5768
name: Test Swift package using Xcode ${{ matrix.xcode }}
@@ -64,7 +75,7 @@ jobs:
6475

6576
steps:
6677
- name: Checkout
67-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
78+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
6879

6980
- name: Set up environment
7081
uses: ./.github/actions/setup
@@ -85,7 +96,7 @@ jobs:
8596

8697
steps:
8798
- name: Checkout
88-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
99+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
89100

90101
- name: Set up environment
91102
uses: ./.github/actions/setup
@@ -101,7 +112,7 @@ jobs:
101112

102113
steps:
103114
- name: Checkout
104-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
115+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
105116

106117
- name: Run SwiftLint
107118
run: swiftlint lint --reporter github-actions-logging

.github/workflows/semgrep.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
# Skip any PR created by dependabot to avoid permission issues
1919
if: (github.actor != 'dependabot[bot]')
2020
steps:
21-
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
21+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
2222

2323
- run: semgrep ci
2424
env:

0 commit comments

Comments
 (0)