4
0
Эх сурвалжийг харах

Merge pull request #756 from aya-rs/wget

github: fix CI
Tamir Duberstein 1 жил өмнө
parent
commit
7874ad99f7

+ 10 - 5
.github/workflows/ci.yml

@@ -193,7 +193,7 @@ jobs:
         # We also need LLVM for bpf-linker, see comment below.
         # We also need LLVM for bpf-linker, see comment below.
         run: |
         run: |
           set -euxo pipefail
           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
           echo /usr/local/opt/llvm/bin >> $GITHUB_PATH
 
 
       - name: bpf-linker
       - name: bpf-linker
@@ -201,6 +201,11 @@ jobs:
         # NB: rustc doesn't ship libLLVM.so on macOS, so disable proxying (default feature).
         # 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
         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
       - name: Download debian kernels
         if: runner.arch == 'ARM64'
         if: runner.arch == 'ARM64'
         run: |
         run: |
@@ -211,8 +216,8 @@ jobs:
           # linux-image-5.10.0-23-cloud-arm64-unsigned_5.10.179-3_arm64.deb \
           # linux-image-5.10.0-23-cloud-arm64-unsigned_5.10.179-3_arm64.deb \
           printf '%s\0' \
           printf '%s\0' \
             linux-image-6.1.0-10-cloud-arm64-unsigned_6.1.38-2_arm64.deb \
             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/{}
+            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
       - name: Download debian kernels
         if: runner.arch == 'X64'
         if: runner.arch == 'X64'
@@ -224,8 +229,8 @@ jobs:
           # linux-image-5.10.0-23-cloud-amd64-unsigned_5.10.179-3_amd64.deb \
           # linux-image-5.10.0-23-cloud-amd64-unsigned_5.10.179-3_amd64.deb \
           printf '%s\0' \
           printf '%s\0' \
             linux-image-6.1.0-10-cloud-amd64-unsigned_6.1.38-2_amd64.deb \
             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/{}
+            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
       - name: Alias gtar as tar
         if: runner.os == 'macOS'
         if: runner.os == 'macOS'