Skip to content

Commit d3ea4e1

Browse files
committed
more release wrangling
1 parent 689ff4c commit d3ea4e1

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

.docker/release.Dockerfile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ RUN { type -p curl >/dev/null || sudo apt-get install curl -y ; } \
3333

3434
# Install .NET
3535
RUN sudo apt-get update && sudo apt-get install --yes --no-install-recommends \
36-
libicu66
36+
libicu70
3737

3838
# (for .NET, cf. https://aka.ms/dotnet-missing-libicu )
3939
# CI dependencies: .NET Core
@@ -53,11 +53,6 @@ ENV PATH=${PATH}:$DOTNET_ROOT:$DOTNET_ROOT/tools
5353
RUN git config --global user.name "Dzomo, the Everest Yak" && \
5454
git config --global user.email "24394600+dzomo@users.noreply.github.com"
5555

56-
# Download and extract z3, but do not add it in the PATH
57-
# We download a z3 that does not depend on libgomp
58-
ADD --chown=opam:opam https://github.com/tahina-pro/z3/releases/download/z3-4.8.5-linux-clang/z3-4.8.5-linux-clang-x86_64.tar.gz z3.tar.gz
59-
RUN tar xf z3.tar.gz
60-
6156
ADD --chown=opam:opam ./ FStar/
6257

6358
# Check if we need to create a tag
@@ -67,7 +62,7 @@ RUN --mount=type=secret,id=DZOMO_GITHUB_TOKEN eval $(opam env) && env GH_TOKEN=$
6762
RUN eval $(opam env) && env OTHERFLAGS='--admit_smt_queries true' PATH=$HOME/z3:$PATH make -j $CI_THREADS -C FStar package
6863

6964
# Test the package with its Z3, without OCaml or any other dependency
70-
FROM ubuntu:20.04 AS fstarnoocaml
65+
FROM ubuntu:22.04 AS fstarnoocaml
7166

7267
# Install some dependencies
7368
RUN apt-get update && \

0 commit comments

Comments
 (0)