Skip to content

Commit be9ccb8

Browse files
committed
Revert "Use the built-in swiftly on macOS builders"
This reverts commit 8abccba.
1 parent 8abccba commit be9ccb8

File tree

3 files changed

+12
-14
lines changed

3 files changed

+12
-14
lines changed

.github/workflows/build_release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ jobs:
5151
steps:
5252
- name: Checkout repository
5353
uses: actions/checkout@v4
54-
- name: Activate Swiftly
55-
run: source /opt/swiftly/env.sh
54+
- name: Prepare the action
55+
run: ./scripts/prep-gh-action.sh --install-swiftly
5656
- name: Build Release Artifact
57-
run: swiftly run swift run build-swiftly-release ${{ inputs.skip }} ${{ inputs.version }}
57+
run: swift run build-swiftly-release ${{ inputs.skip }} ${{ inputs.version }}
5858
- name: Upload Release Artifact
5959
uses: actions/upload-artifact@v4
6060
with:

.github/workflows/nightly_snapshot_check.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ jobs:
3333
steps:
3434
- name: Checkout repository
3535
uses: actions/checkout@v4
36-
- name: Activate Swiftly
37-
run: source /opt/swiftly/env.sh
38-
- name: Install Main Snapshot
39-
run: swiftly install main-snapshot
36+
- name: Prepare the action
37+
run: ./scripts/prep-gh-action.sh --install-swiftly --swift-main-snapshot
4038
- name: Build and Test
41-
run: swiftly run +main-snapshot swift test
39+
run: swift test

.github/workflows/pull_request.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ jobs:
3030
steps:
3131
- name: Checkout repository
3232
uses: actions/checkout@v4
33-
- name: Activate Swiftly
34-
run: source /opt/swiftly/env.sh
33+
- name: Prepare the action
34+
run: ./scripts/prep-gh-action.sh --install-swiftly
3535
- name: Build and Test
36-
run: swiftly run swift test
36+
run: swift test
3737
timeout-minutes: 60
3838

3939
tests-selfhosted:
@@ -88,10 +88,10 @@ jobs:
8888
steps:
8989
- name: Checkout repository
9090
uses: actions/checkout@v4
91-
- name: Activate Swiftly
92-
run: source /opt/swiftly/env.sh
91+
- name: Prepare the action
92+
run: ./scripts/prep-gh-action.sh --install-swiftly
9393
- name: Build Artifact
94-
run: swiftly run swift run build-swiftly-release --test --skip "999.0.0"
94+
run: swift run build-swiftly-release --test --skip "999.0.0"
9595
- name: Upload Artifact
9696
uses: actions/upload-artifact@v4
9797
with:

0 commit comments

Comments
 (0)