Skip to content

Commit 40f5fbd

Browse files
committed
ci: switch build scripts from wget to curl
runc's build scripts and CI setup used a mix of wget (4 sites) and curl (8 sites) for HTTPS fetches. Standardise the three script sites on curl, which is already required by the majority of call sites. * script/build-libpathrs.sh and script/build-seccomp.sh: replace wget "<url>"{,.asc} with curl -fsSLO "<url>"{,.asc}. Bash brace expansion still yields two separate downloads (the tarball and its .asc signature). * script/setup_host.sh: replace wget with curl in the Fedora RPM install list. Leaving the single wget call in Dockerfile untouched per review feedback -- the trixie base image already ships wget, and switching would add an extra apt-get update && install step before the existing single-pass package install. Refs #5240 Signed-off-by: Ali <alliasgher123@gmail.com>
1 parent eb7eaf1 commit 40f5fbd

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

script/build-libpathrs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ function build_libpathrs() {
7575
local tar="libpathrs-${ver}.tar.xz"
7676

7777
# Download, check, and extract.
78-
wget "https://github.com/cyphar/libpathrs/releases/download/v${ver}/${tar}"{,.asc}
78+
curl -fsSL --remote-name-all "https://github.com/cyphar/libpathrs/releases/download/v${ver}/${tar}"{,.asc}
7979
sha256sum --strict --check - <<<"${LIBPATHRS_SHA256[${ver}]} *${tar}"
8080

8181
local srcdir

script/build-seccomp.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ function build_libseccomp() {
2727
local tar="libseccomp-${ver}.tar.gz"
2828

2929
# Download, check, and extract.
30-
wget "https://github.com/seccomp/libseccomp/releases/download/v${ver}/${tar}"{,.asc}
30+
curl -fsSL --remote-name-all "https://github.com/seccomp/libseccomp/releases/download/v${ver}/${tar}"{,.asc}
3131
sha256sum --strict --check - <<<"${SECCOMP_SHA256[${ver}]} *${tar}"
3232

3333
local srcdir

script/setup_host.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ platform:el9 | platform:el10)
3434
esac
3535

3636
# Install common packages
37-
RPMS=(cargo container-selinux fuse-sshfs git-core glibc-static golang iptables jq libseccomp-devel lld make policycoreutils wget)
37+
RPMS=(cargo container-selinux curl fuse-sshfs git-core glibc-static golang iptables jq libseccomp-devel lld make policycoreutils)
3838
# Work around dnf mirror failures by retrying a few times.
3939
for i in $(seq 0 2); do
4040
sleep "$i"

0 commit comments

Comments
 (0)