Skip to content

Commit

Permalink
Temporary CI fixes
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
tahina-pro committed Nov 21, 2024
1 parent 5f7e9be commit e3290cf
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .docker/hierarchic.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .docker/standalone.Dockerfile
Original file line number Diff line number Diff line change
@@ -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 && \
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit e3290cf

Please sign in to comment.