Skip to content

Commit 4c77cc6

Browse files
committed
Reduce tests to just jammy, and rely on swiftly being added to the path
1 parent 13323a9 commit 4c77cc6

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.github/workflows/pull_request.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@ jobs:
3636
- name: Install swiftly
3737
run: cd /root && curl -O https://download.swift.org/swiftly/linux/swiftly-0.4.0-dev-x86_64.tar.gz && tar zxf swiftly-*.tar.gz && ./swiftly init --skip-install
3838
- name: Install selected swift toolchain
39-
run: /root/.local/share/swiftly/bin/swiftly install --post-install-file=post-install.sh
39+
run: swiftly install --post-install-file=post-install.sh
4040
- name: Perform swift toolchain post-installation
4141
run: chmod u+x post-install.sh && ./post-install.sh
4242
- name: Build and Test
43-
run: CC=clang /root/.local/share/swiftly/bin/swiftly run ./scripts/install-libarchive.sh && /root/.local/share/swiftly/bin/swiftly run swift test
43+
run: CC=clang swiftly run ./scripts/install-libarchive.sh && swift test
4444

4545
tests:
4646
name: Test
4747
uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
4848
with:
49-
linux_os_versions: "[\"jammy\", \"focal\", \"rhel-ubi9\", \"noble\", \"bookworm\", \"fedora39\"]"
49+
linux_os_versions: "[\"jammy\"]"
5050
# We only care about the current stable release, because that's where we make our swiftly releases
5151
linux_exclude_swift_versions: "[{\"swift_version\": \"nightly-main\"},{\"swift_version\": \"nightly-6.0\"},{\"swift_version\": \"5.8\"},{\"swift_version\": \"5.9\"},{\"swift_version\": \"5.10\"}]"
5252
linux_pre_build_command: ./scripts/prep-gh-action.sh && ./scripts/install-libarchive.sh

0 commit comments

Comments
 (0)