Skip to content

Commit e5c1da0

Browse files
committed
Add appropriate libstdc++ to images that are missing them, and gnupg
1 parent b052c2b commit e5c1da0

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

.github/workflows/pull_request.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
2323
with:
2424
# Amazon Linux 2 won't work with GH infrastructure
25-
linux_os_versions: "[\"jammy\", \"focal\", \"rhel-ubi9\", \"noble\", \"bookworm\", \"fedora39\"]"
25+
# linux_os_versions: "[\"jammy\", \"focal\", \"rhel-ubi9\", \"noble\", \"bookworm\", \"fedora39\"]"
2626
# We only care about the current stable release, because that's where we make our swiftly releases
2727
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\"}]"
28-
linux_pre_build_command: ((apt-get update && apt-get -y install curl make) || ((curl --help || yum -y install curl) && yum -y install make)) && ./scripts/install-libarchive.sh
28+
linux_pre_build_command: ./scripts/prep-gh-action.sh && ./scripts/install-libarchive.sh
2929
enable_windows_checks: false
3030

3131
releasebuild:
@@ -35,7 +35,7 @@ jobs:
3535
linux_os_versions: "[\"rhel-ubi9\"]"
3636
# We only care about the current stable release, because that's where we make our swiftly releases
3737
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\"}]"
38-
linux_pre_build_command: echo ""
38+
linux_pre_build_command: ./scripts/prep-gh-action.sh
3939
linux_build_command: swift run build-swiftly-release --skip 0.4.0
4040
enable_windows_checks: false
4141

@@ -46,6 +46,6 @@ jobs:
4646
# We only need to run this with one swift release and on one of the linux distributions
4747
linux_os_versions: "[\"jammy\"]"
4848
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\"}]"
49-
linux_pre_build_command: echo ""
49+
linux_pre_build_command: ./scripts/prep-gh-action.sh
5050
linux_build_command: swift run swiftformat --lint --dryrun .
5151
enable_windows_checks: false

scripts/prep-gh-action.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
3+
apt-get --help && apt-get update && apt-get -y install curl make
4+
yum --help && (curl --help && yum -y install curl) && yum install make
5+
6+
(cat /etc/os-release | grep bookworm) && apt-get -y install libstdc++-12-dev gnupg2
7+
(cat /etc/os-release | grep 'Fedora Linux 39') && yum -y install libstdc++-devel
8+
9+
exit 0

0 commit comments

Comments
 (0)