From e3290cfae98f9516dd62c8ad17b89f95318e52ec Mon Sep 17 00:00:00 2001 From: Tahina Ramananandro Date: Wed, 20 Nov 2024 16:16:23 -0800 Subject: [PATCH] Temporary CI fixes Since Ubuntu 23.10 is EOL, and 24.04 does not work with F* CI, the latter was reverted to Ubuntu 22.04, see FStarLang/FStar#3615 This commit adapts to this change. --- .docker/hierarchic.Dockerfile | 2 +- .docker/standalone.Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.docker/hierarchic.Dockerfile b/.docker/hierarchic.Dockerfile index 6ecb712c..4e1c1cb9 100644 --- a/.docker/hierarchic.Dockerfile +++ b/.docker/hierarchic.Dockerfile @@ -16,7 +16,7 @@ RUN sudo apt-get install -y nodejs rust-all # sudo pip3 because of https://bugs.launchpad.net/ubuntu/+source/bash/+bug/1588562 # jinja2==3.0.0 because of https://github.com/mkdocs/mkdocs/issues/2799 RUN sudo apt-get install --yes --no-install-recommends python3-pip python3-setuptools python3-distutils -RUN sudo pip3 install --break-system-packages pytz tzdata sphinx==1.7.2 jinja2==3.0.0 alabaster==0.7.13 sphinx_rtd_theme +RUN sudo pip3 install --break-system-packages pytz tzdata sphinx==1.7.2 jinja2==3.0.0 alabaster==0.7.13 sphinx_rtd_theme || sudo pip3 install pytz tzdata sphinx==1.7.2 jinja2==3.0.0 alabaster==0.7.13 sphinx_rtd_theme # unsafe-yes necessary to handle automatic system dependency changes with depext # See https://github.com/ocaml/opam/issues/4814 diff --git a/.docker/standalone.Dockerfile b/.docker/standalone.Dockerfile index 6470d2d4..948b5a55 100644 --- a/.docker/standalone.Dockerfile +++ b/.docker/standalone.Dockerfile @@ -1,6 +1,6 @@ # This Dockerfile should be run from the root Karamel directory -FROM ubuntu:23.10 +FROM ubuntu:22.04 # CI dependencies: opam, jq (to identify F* branch) RUN apt-get update && \ @@ -56,7 +56,7 @@ RUN sudo apt-get install -y --no-install-recommends nodejs # sudo pip3 because of https://bugs.launchpad.net/ubuntu/+source/bash/+bug/1588562 # jinja2==3.0.0 because of https://github.com/mkdocs/mkdocs/issues/2799 RUN sudo apt-get install --yes --no-install-recommends python3-pip python3-setuptools python3-distutils -RUN sudo pip3 install --break-system-packages pytz tzdata sphinx==1.7.2 jinja2==3.0.0 alabaster==0.7.13 sphinx_rtd_theme +RUN sudo pip3 install --break-system-packages pytz tzdata sphinx==1.7.2 jinja2==3.0.0 alabaster==0.7.13 sphinx_rtd_theme || sudo pip3 install pytz tzdata sphinx==1.7.2 jinja2==3.0.0 alabaster==0.7.13 sphinx_rtd_theme # CI proper ARG CI_THREADS=24