Skip to content

Commit 9258863

Browse files
committed
change ln to update-alternatives, add lit and wllvm
1 parent 7c06e1f commit 9258863

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
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": "24-11-2021",
4+
"DOCKER_TAG": "18-01-2022",
55
"OPERATING_SYSTEM_TAG": "18.04"
66
}
77
]

docker/Dockerfile_base

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ FROM ubuntu:$OPERATING_SYSTEM_TAG as base_env
1111
LABEL maintainer="Huawei UTBot cloud team"
1212
SHELL ["/bin/bash", "--login", "-c"]
1313

14-
ENV CC=gcc
1514
ENV UTBOT_ALL=/utbot_distr
1615
ENV WORKSPACE=/github/workspace/
1716

@@ -28,11 +27,10 @@ RUN echo "check_certificate = off" > /etc/wgetrc
2827

2928
# We use C++ 17 for UnitTestBot, it is available in gcc-9; default gcc for ubuntu:18.04 is gcc-7
3029
RUN add-apt-repository ppa:ubuntu-toolchain-r/test
31-
RUN apt remove --purge -y gcc g++
3230
RUN apt update && apt install -y --no-install-recommends gcc-9 g++-9
33-
RUN ln -s /usr/bin/gcov-9 /usr/bin/gcov
34-
RUN ln -s /usr/bin/gcc-9 /usr/bin/gcc
35-
RUN ln -s /usr/bin/g++-9 /usr/bin/g++
31+
RUN sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 100
32+
RUN sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 100
33+
RUN sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-9 100
3634

3735
# install git
3836
RUN apt install -y software-properties-common
@@ -109,7 +107,9 @@ USER utbot
109107
RUN sudo -E apt install -y --no-install-recommends curl libcap-dev libncurses5-dev unzip libtcmalloc-minimal4 libgoogle-perftools-dev libsqlite3-dev doxygen python3-pip
110108
ENV CURL_CA_BUNDLE=""
111109
RUN sudo -E pip3 install tabulate==0.8.7 \
112-
typing==3.7.4.3
110+
typing==3.7.4.3 \
111+
lit==0.11.0.post1 \
112+
wllvm==1.3.1
113113

114114
# Install z3
115115
USER root
@@ -166,8 +166,7 @@ USER root
166166
COPY building_dependencies/patches/lit.py /usr/local/bin/lit
167167
RUN chmod +x /usr/local/bin/lit
168168

169-
RUN sudo rm /usr/bin/python
170-
RUN sudo ln -s /usr/bin/python3 /usr/bin/python
169+
RUN sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 100
171170

172171
# Download CLI11 and Rang libs for nice CLI
173172
RUN wget https://github.com/CLIUtils/CLI11/releases/download/v1.9.1/CLI11.hpp -P $UTBOT_ALL/cli

0 commit comments

Comments
 (0)