diff options
| -rwxr-xr-x | .github/workflows/ci.generate.ts | 11 | ||||
| -rw-r--r-- | .github/workflows/ci.yml | 11 |
2 files changed, 10 insertions, 12 deletions
diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts index 4f6f0c0f4..acbefd055 100755 --- a/.github/workflows/ci.generate.ts +++ b/.github/workflows/ci.generate.ts @@ -83,7 +83,7 @@ sudo apt-get update # this was unreliable sometimes, so try again if it fails ${installPkgsCommand} || echo 'Failed. Trying again.' && sudo apt-get clean && sudo apt-get update && ${installPkgsCommand} # Fix alternatives -(yes '' | sudo update-alternatives --force --all) || true > /dev/null 2> /dev/null +(yes '' | sudo update-alternatives --force --all) > /dev/null 2> /dev/null || true echo "Decompressing sysroot..." wget -q https://github.com/denoland/deno_sysroot_build/releases/download/sysroot-20240207/sysroot-\`uname -m\`.tar.xz -O /tmp/sysroot.tar.xz @@ -101,11 +101,10 @@ if [[ \`uname -m\` == "aarch64" ]]; then echo "Copying libdl.so" sudo cp /sysroot/lib/aarch64-linux-gnu/libdl.so.2 /sysroot/lib/aarch64-linux-gnu/libdl.so else - wget https://github.com/denoland/deno_third_party/raw/master/prebuilt/linux64/libdl/libdl.a - wget https://github.com/denoland/deno_third_party/raw/master/prebuilt/linux64/libdl/libdl.so.2 - - sudo ln -s libdl.so.2 /sysroot/lib/x86_64-linux-gnu/libdl.so - sudo ln -s libdl.a /sysroot/lib/x86_64-linux-gnu/libdl.a + echo "Copying libdl.a" + sudo cp /sysroot/usr/lib/x86_64-linux-gnu/libdl.a /sysroot/lib/x86_64-linux-gnu/libdl.a + echo "Copying libdl.so" + sudo cp /sysroot/lib/x86_64-linux-gnu/libdl.so.2 /sysroot/lib/x86_64-linux-gnu/libdl.so fi # Configure the build environment. Both Rust and Clang will produce diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e7e64786a..4db6c8506 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -265,7 +265,7 @@ jobs: # this was unreliable sometimes, so try again if it fails sudo apt-get install --no-install-recommends debootstrap clang-16 lld-16 clang-tools-16 clang-format-16 clang-tidy-16 || echo 'Failed. Trying again.' && sudo apt-get clean && sudo apt-get update && sudo apt-get install --no-install-recommends debootstrap clang-16 lld-16 clang-tools-16 clang-format-16 clang-tidy-16 # Fix alternatives - (yes '' | sudo update-alternatives --force --all) || true > /dev/null 2> /dev/null + (yes '' | sudo update-alternatives --force --all) > /dev/null 2> /dev/null || true echo "Decompressing sysroot..." wget -q https://github.com/denoland/deno_sysroot_build/releases/download/sysroot-20240207/sysroot-`uname -m`.tar.xz -O /tmp/sysroot.tar.xz @@ -283,11 +283,10 @@ jobs: echo "Copying libdl.so" sudo cp /sysroot/lib/aarch64-linux-gnu/libdl.so.2 /sysroot/lib/aarch64-linux-gnu/libdl.so else - wget https://github.com/denoland/deno_third_party/raw/master/prebuilt/linux64/libdl/libdl.a - wget https://github.com/denoland/deno_third_party/raw/master/prebuilt/linux64/libdl/libdl.so.2 - - sudo ln -s libdl.so.2 /sysroot/lib/x86_64-linux-gnu/libdl.so - sudo ln -s libdl.a /sysroot/lib/x86_64-linux-gnu/libdl.a + echo "Copying libdl.a" + sudo cp /sysroot/usr/lib/x86_64-linux-gnu/libdl.a /sysroot/lib/x86_64-linux-gnu/libdl.a + echo "Copying libdl.so" + sudo cp /sysroot/lib/x86_64-linux-gnu/libdl.so.2 /sysroot/lib/x86_64-linux-gnu/libdl.so fi # Configure the build environment. Both Rust and Clang will produce |