diff options
| author | arcsi42 <arcsi42@protonmail.com> | 2022-01-20 00:17:07 +0100 |
|---|---|---|
| committer | Andrew Gallant <jamslam@gmail.com> | 2022-03-21 08:59:05 -0400 |
| commit | b6189c659e2cf6ff70c5fd7bbc31a9a8fdb44d94 (patch) | |
| tree | 1bb9ff88162a867547d625e4c4332871c494a0b8 | |
| parent | 0b36942f680bfa9ae88a564f2636aa8286470073 (diff) | |
ci: fix failing nightly-arm build on ci workflow
This commit updates the Ubuntu install script to include brotli and
zstd, which are needed for tests.
We also fix the Ubuntu install script to work in environments that
don't have 'sudo'. Instead of creating a totally separate script, we
preserve a single point of truth for these things and just make the
script a bit more flexible.
NOT seen in this commit is that we have built and updated the arm Docker
image. I'm hoping this fixes the GLIBC version issues we're seeing in
CI.
Fixes #2130, Closes #2132
| -rwxr-xr-x | ci/ubuntu-install-packages | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/ci/ubuntu-install-packages b/ci/ubuntu-install-packages index b372e0e4..c66fd380 100755 --- a/ci/ubuntu-install-packages +++ b/ci/ubuntu-install-packages @@ -1,6 +1,16 @@ #!/bin/sh +# This script gets run in weird environments that have been stripped of just +# about every inessential thing. In order to keep this script versatile, we +# just install 'sudo' and use it like normal if it doesn't exist. If it doesn't +# exist, we assume we're root. (Otherwise we ain't doing much of anything +# anyway.) +if ! command -V sudo; then + apt-get update + apt-get install -y --no-install-recommends sudo +fi sudo apt-get update sudo apt-get install -y --no-install-recommends \ asciidoctor \ - zsh xz-utils liblz4-tool musl-tools + zsh xz-utils liblz4-tool musl-tools \ + brotli zstd |