diff options
| author | bors <bors@rust-lang.org> | 2022-09-02 05:32:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-02 05:32:57 +0000 |
| commit | b10aed0084e3fb32b365dba06a1b644c3b0f438b (patch) | |
| tree | 2c07f6779095b1815236e3236a3dd189ef225388 /src/ci/docker/scripts | |
| parent | 301348077d364d536d5f7cb57a72b85d9966ded6 (diff) | |
| parent | 9e5bc44be45b53e71af45d66613d2fdb62f4d523 (diff) | |
| download | rust-b10aed0084e3fb32b365dba06a1b644c3b0f438b.tar.gz rust-b10aed0084e3fb32b365dba06a1b644c3b0f438b.zip | |
Auto merge of #100935 - cuviper:upgrade-android-ci, r=Mark-Simulacrum
ci: Upgrade android containers from ubuntu:16.04 to 22.04 The main goal of updating to 22.04 is to get away from `llvm.allow-old-toolchain`. These containers are not building LLVM for android, so only the host version matters. A side benefit is that they can also use the system `cmake` instead of building one.
Diffstat (limited to 'src/ci/docker/scripts')
| -rw-r--r-- | src/ci/docker/scripts/android-base-apt-get.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/ci/docker/scripts/android-base-apt-get.sh b/src/ci/docker/scripts/android-base-apt-get.sh index f1761f80643..22e2e243e43 100644 --- a/src/ci/docker/scripts/android-base-apt-get.sh +++ b/src/ci/docker/scripts/android-base-apt-get.sh @@ -10,6 +10,7 @@ apt-get install -y --no-install-recommends \ g++ \ git \ libssl-dev \ + libncurses5 \ make \ ninja-build \ pkg-config \ |