Skip to content

Commit fbefad8

Browse files
committed
github actions: no longer require nightly swift
1 parent 16e98fe commit fbefad8

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

.github/workflows/pull_request.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ jobs:
1919
strategy:
2020
fail-fast: true
2121
matrix:
22-
swift_version: ['nightly-main']
22+
# swift_version: ['nightly-main']
23+
swift_version: ['6.0.2']
2324
os_version: ['jammy']
2425
jdk_vendor: ['Corretto']
2526
container:
@@ -43,8 +44,8 @@ jobs:
4344
if: steps.cache-jdk.outputs.cache-hit != 'true'
4445
run: "bash -xc 'JDK_VENDOR=${{ matrix.jdk_vendor }} ./docker/install_jdk.sh'"
4546
# TODO: not using setup-java since incompatible with the swiftlang/swift base image
46-
- name: Install Untested Nightly Swift
47-
run: "bash -xc './docker/install_untested_nightly_swift.sh'"
47+
# - name: Install Untested Nightly Swift
48+
# run: "bash -xc './docker/install_untested_nightly_swift.sh'"
4849
- name: Cache local Gradle repository
4950
uses: actions/cache@v4
5051
continue-on-error: true
@@ -79,7 +80,8 @@ jobs:
7980
strategy:
8081
fail-fast: false
8182
matrix:
82-
swift_version: ['nightly-main']
83+
# swift_version: ['nightly-main']
84+
swift_version: ['6.0.2']
8385
os_version: ['jammy']
8486
jdk_vendor: ['Corretto']
8587
container:
@@ -103,8 +105,8 @@ jobs:
103105
if: steps.cache-jdk.outputs.cache-hit != 'true'
104106
run: "bash -xc 'JDK_VENDOR=${{ matrix.jdk_vendor }} ./docker/install_jdk.sh'"
105107
# TODO: not using setup-java since incompatible with the swiftlang/swift base image
106-
- name: Install Untested Nightly Swift
107-
run: "bash -xc './docker/install_untested_nightly_swift.sh'"
108+
# - name: Install Untested Nightly Swift
109+
# run: "bash -xc './docker/install_untested_nightly_swift.sh'"
108110
- name: Cache local Gradle repository
109111
uses: actions/cache@v4
110112
continue-on-error: true

0 commit comments

Comments
 (0)