Skip to content

Commit af73b12

Browse files
authored
Update for nightly-6.2 toolchain (#1591)
Can use that in the devcontainer as latest. Turn of in CI verifier jobs, and don't run in insiders nightly
1 parent 4852aff commit af73b12

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM swiftlang/swift:nightly-6.1-jammy
1+
FROM swiftlang/swift:nightly-6.2-jammy
22

33
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \
44
&& apt-get -q update \

.github/workflows/nightly.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ jobs:
5151
with:
5252
needs_token: true
5353
# Linux
54+
linux_exclude_swift_versions: '[{"swift_version": "nightly-6.1"}]'
5455
linux_env_vars: |
5556
NODE_VERSION=v20.19.0
5657
NODE_PATH=/usr/local/nvm/versions/node/v20.19.0/bin
@@ -78,7 +79,7 @@ jobs:
7879
with:
7980
needs_token: true
8081
# Linux
81-
linux_exclude_swift_versions: '[{"swift_version": "5.8"}, {"swift_version": "5.9"}, {"swift_version": "5.10"}, {"swift_version": "6.0"}, {"swift_version": "nightly-6.1"}, {"swift_version": "nightly-main"}]'
82+
linux_exclude_swift_versions: '[{"swift_version": "5.8"}, {"swift_version": "5.9"}, {"swift_version": "5.10"}, {"swift_version": "6.0"}, {"swift_version": "nightly-6.1"}, {"swift_version": "nightly-6.2"}, {"swift_version": "nightly-main"}]'
8283
linux_env_vars: |
8384
NODE_VERSION=v20.19.0
8485
NODE_PATH=/usr/local/nvm/versions/node/v20.19.0/bin
@@ -90,7 +91,7 @@ jobs:
9091
linux_pre_build_command: . .github/workflows/scripts/setup-linux.sh
9192
linux_build_command: ./scripts/test.sh
9293
# Windows
93-
windows_exclude_swift_versions: '[{"swift_version": "5.9"}, {"swift_version": "6.0"}, {"swift_version": "nightly-6.1"}, {"swift_version": "nightly"}]'
94+
windows_exclude_swift_versions: '[{"swift_version": "5.9"}, {"swift_version": "6.0"}, {"swift_version": "nightly-6.1"}, {"swift_version": "nightly-6.2"}, {"swift_version": "nightly"}]'
9495
windows_env_vars: |
9596
CI=1
9697
VSCODE_VERSION=insiders

.github/workflows/pull_request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
4949
with:
5050
# Linux
51-
linux_exclude_swift_versions: '[{"swift_version": "nightly-6.1"},{"swift_version": "nightly-main"}]'
51+
linux_exclude_swift_versions: '[{"swift_version": "nightly-6.1"},{"swift_version": "nightly-6.2"},{"swift_version": "nightly-main"}]'
5252
linux_env_vars: |
5353
NODE_VERSION=v20.19.0
5454
NODE_PATH=/usr/local/nvm/versions/node/v20.19.0/bin
@@ -58,7 +58,7 @@ jobs:
5858
linux_pre_build_command: . .github/workflows/scripts/setup-linux.sh
5959
linux_build_command: ./scripts/test.sh
6060
# Windows
61-
windows_exclude_swift_versions: '[{"swift_version": "nightly-6.1"},{"swift_version": "nightly"}]'
61+
windows_exclude_swift_versions: '[{"swift_version": "nightly-6.1"},{"swift_version": "nightly-6.2"},{"swift_version": "nightly"}]'
6262
windows_env_vars: |
6363
CI=1
6464
FAST_TEST_RUN=${{ contains(github.event.pull_request.labels.*.name, 'full-test-run') && '0' || '1'}}

0 commit comments

Comments
 (0)