Skip to content

Commit 68a5b49

Browse files
committed
Update z3 in Dockerfile_base
1 parent 915f4d0 commit 68a5b49

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/matrix.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"include": [
33
{
4-
"DOCKER_TAG": "2022.10.0",
4+
"DOCKER_TAG": "2023.10.0",
55
"OPERATING_SYSTEM_TAG": "18.04",
66
"LLVM_VERSION_MAJOR": "10"
77
}

docker/Dockerfile_base

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ RUN git clone --single-branch --branch "release/${LLVM_VERSION_MAJOR}.x" --depth
7474
WORKDIR $UTBOT_ALL/llvm-project
7575
RUN mkdir build && cd build \
7676
&& $UTBOT_CMAKE_BINARY \
77-
-DCMAKE_BUILD_TYPE="Release" \
77+
-DCMAKE_BUILD_TYPE=MinSizeRel \
7878
-DCMAKE_INSTALL_PREFIX=$UTBOT_INSTALL_DIR \
7979
-DLLVM_INCLUDE_TESTS=OFF \
8080
-DLLVM_BINUTILS_INCDIR=$UTBOT_ALL/llvm_gold_plugin \
@@ -125,7 +125,7 @@ RUN cd $UTBOT_ALL/grpc && git submodule update --init
125125
RUN cd $UTBOT_ALL/grpc \
126126
&& mkdir -p cmake/build \
127127
&& cd cmake/build \
128-
&& $UTBOT_CMAKE_BINARY -DgRPC_INSTALL=ON -DgRPC_BUILD_TESTS=OFF -DCMAKE_INSTALL_PREFIX=$UTBOT_INSTALL_DIR ../.. \
128+
&& $UTBOT_CMAKE_BINARY -DgRPC_INSTALL=ON -DgRPC_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_INSTALL_PREFIX=$UTBOT_INSTALL_DIR ../.. \
129129
&& make -j`nproc` \
130130
&& make install \
131131
&& cd $UTBOT_ALL \
@@ -142,9 +142,9 @@ USER utbot
142142

143143
# Install z3
144144
USER root
145-
RUN git clone --single-branch -b z3-4.8.7 --depth=1 https://github.com/Z3Prover/z3.git $UTBOT_ALL/z3-src
145+
RUN git clone --single-branch -b z3-4.8.17 --depth=1 https://github.com/Z3Prover/z3.git $UTBOT_ALL/z3-src
146146
RUN cd $UTBOT_ALL/z3-src && mkdir build && cd build && \
147-
$UTBOT_CMAKE_BINARY -G "Ninja" -DCMAKE_INSTALL_PREFIX=$UTBOT_INSTALL_DIR .. && \
147+
$UTBOT_CMAKE_BINARY -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$UTBOT_INSTALL_DIR .. && \
148148
$UTBOT_CMAKE_BINARY --build . --target install && \
149149
cd $UTBOT_ALL && \
150150
rm -rf $UTBOT_ALL/z3-src
@@ -171,7 +171,7 @@ RUN npm config set strict-ssl false
171171
RUN npm cache clean -f
172172
RUN sudo -E npm install -g n
173173
RUN echo insecure > ~/.curlrc
174-
RUN sudo -E n stable
174+
RUN sudo -E n 16
175175
RUN sudo -E apt remove -y --purge nodejs npm
176176

177177
# Install cmake which can generate link_commands.json. Installing cmake the second time in order to build base image faster since this cmake may be changed frequently.

0 commit comments

Comments
 (0)