From 47a8a4b8783ec9f9cd4e90e6289eca5ca934c6f8 Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Mon, 14 Aug 2023 10:36:37 -0400 Subject: [PATCH 1/3] github: reduce wget verbosity, remove -q This allows errors to be shown; -q hides *all* output, which is not what we want. --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1ff70200..f886c2a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -212,7 +212,7 @@ jobs: printf '%s\0' \ linux-image-6.1.0-10-cloud-arm64-unsigned_6.1.38-2_arm64.deb \ linux-image-6.4.0-1-cloud-arm64-unsigned_6.4.4-2_arm64.deb \ - | xargs -0 -t -P0 -I {} wget -nd -q -P test/.tmp/debian-kernels/arm64 ftp://ftp.us.debian.org/debian/pool/main/l/linux/{} + | xargs -0 -t -P0 -I {} wget -nd -nv -P test/.tmp/debian-kernels/arm64 ftp://ftp.us.debian.org/debian/pool/main/l/linux/{} - name: Download debian kernels if: runner.arch == 'X64' @@ -225,7 +225,7 @@ jobs: printf '%s\0' \ linux-image-6.1.0-10-cloud-amd64-unsigned_6.1.38-2_amd64.deb \ linux-image-6.4.0-1-cloud-amd64-unsigned_6.4.4-2_amd64.deb \ - | xargs -0 -t -P0 -I {} wget -nd -q -P test/.tmp/debian-kernels/amd64 ftp://ftp.us.debian.org/debian/pool/main/l/linux/{} + | xargs -0 -t -P0 -I {} wget -nd -nv -P test/.tmp/debian-kernels/amd64 ftp://ftp.us.debian.org/debian/pool/main/l/linux/{} - name: Alias gtar as tar if: runner.os == 'macOS' From 89eafd139d06c91cb137e36d8c13c3be13e6b936 Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Mon, 14 Aug 2023 11:00:16 -0400 Subject: [PATCH 2/3] github: use gxargs on macOS `xargs -P0` always exits 0 on macOS, even on error. --- .github/workflows/ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f886c2a9..c408ee93 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -193,7 +193,7 @@ jobs: # We also need LLVM for bpf-linker, see comment below. run: | set -euxo pipefail - brew install qemu dpkg pkg-config llvm + brew install findutils qemu dpkg pkg-config llvm echo /usr/local/opt/llvm/bin >> $GITHUB_PATH - name: bpf-linker @@ -201,6 +201,11 @@ jobs: # NB: rustc doesn't ship libLLVM.so on macOS, so disable proxying (default feature). run: cargo install bpf-linker --git https://github.com/aya-rs/bpf-linker.git --no-default-features + - name: Alias gxargs as xargs + if: runner.os == 'macOS' + # macOS xargs always exits 0 with -P0. + run: mkdir xargs-is-gxargs && ln -s "$(which gxargs)" xargs-is-gxargs/xargs && echo "$PWD"/xargs-is-gxargs >> $GITHUB_PATH + - name: Download debian kernels if: runner.arch == 'ARM64' run: | From 6740c43a0282a22b59c021953a45dab47547ab7e Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Mon, 14 Aug 2023 10:37:10 -0400 Subject: [PATCH 3/3] github: update 6.4.0 URLs Seems the previous spin was pulled. --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c408ee93..a078ee35 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -216,7 +216,7 @@ jobs: # linux-image-5.10.0-23-cloud-arm64-unsigned_5.10.179-3_arm64.deb \ printf '%s\0' \ linux-image-6.1.0-10-cloud-arm64-unsigned_6.1.38-2_arm64.deb \ - linux-image-6.4.0-1-cloud-arm64-unsigned_6.4.4-2_arm64.deb \ + linux-image-6.4.0-2-cloud-arm64-unsigned_6.4.4-3_arm64.deb \ | xargs -0 -t -P0 -I {} wget -nd -nv -P test/.tmp/debian-kernels/arm64 ftp://ftp.us.debian.org/debian/pool/main/l/linux/{} - name: Download debian kernels @@ -229,7 +229,7 @@ jobs: # linux-image-5.10.0-23-cloud-amd64-unsigned_5.10.179-3_amd64.deb \ printf '%s\0' \ linux-image-6.1.0-10-cloud-amd64-unsigned_6.1.38-2_amd64.deb \ - linux-image-6.4.0-1-cloud-amd64-unsigned_6.4.4-2_amd64.deb \ + linux-image-6.4.0-2-cloud-amd64-unsigned_6.4.4-3_amd64.deb \ | xargs -0 -t -P0 -I {} wget -nd -nv -P test/.tmp/debian-kernels/amd64 ftp://ftp.us.debian.org/debian/pool/main/l/linux/{} - name: Alias gtar as tar