From 2dda21f0af28c153050e48f32884ed3faad8a48d Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Sat, 11 Dec 2021 11:16:46 -0800 Subject: [PATCH] Roll back to working version of Ante This reverts commit 066c543e3035caf9356cfc0d9c35c40b70a1cee6. --- docker/ci/Dockerfile | 2 +- langs/ante.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/ci/Dockerfile b/docker/ci/Dockerfile index 8098cb4..e15397b 100644 --- a/docker/ci/Dockerfile +++ b/docker/ci/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:rolling +FROM ubuntu:21.04 COPY docker/ci/install.bash /tmp/ RUN /tmp/install.bash diff --git a/langs/ante.yaml b/langs/ante.yaml index 344e3e1..e061695 100644 --- a/langs/ante.yaml +++ b/langs/ante.yaml @@ -9,7 +9,6 @@ install: - cargo - cmake - libssl-dev - - libunwind-dev - pkg-config - python3-distutils manual: | @@ -18,11 +17,12 @@ install: llvmenv init # If compiler is not explicitly set to LLVM, then we get an # error: unrecognized command-line option ‘-Wnewline-eof’. - CC=/usr/bin/clang CXX=/usr/bin/clang++ llvmenv build-entry -G Makefile -j$(nproc) 12.0.1 - llvmenv global 12.0.1 + CC=/usr/bin/clang CXX=/usr/bin/clang++ llvmenv build-entry -G Makefile -j$(nproc) 10.0.0 + llvmenv global 10.0.0 manual: | - git clone https://github.com/jfecher/ante.git + git clone https://github.com/jfecher/ante.git -n pushd ante + git checkout 6e61e9f7ed9300ed68f6b9459b69f027e09a0c42 LLVM_SYS_100_PREFIX="$(llvmenv prefix)" cargo build --release install -d "${pkg}/opt/ante" install -d "${pkg}/usr/local/bin"