diff --git a/ci/conan-tests b/ci/conan-tests index 7d56690c6ce..3137e6f8475 100644 --- a/ci/conan-tests +++ b/ci/conan-tests @@ -13,16 +13,12 @@ ENV PY36=3.6.15 \ CMAKE_3_17_5=/usr/share/cmake-3.17.5/bin/cmake \ CMAKE_3_19_7=/usr/share/cmake-3.19.7/bin/cmake \ CMAKE_3_23_5=/usr/share/cmake-3.23.5/bin/cmake \ - GCC_7=/usr/bin/gcc-7 \ - GXX_7=/usr/bin/g++-7 \ GCC_9=/usr/bin/gcc-9 \ GXX_9=/usr/bin/g++-9 \ GCC_11=/usr/bin/gcc-11 \ GXX_11=/usr/bin/g++-11 \ - CLANG_7=/usr/bin/clang-7 \ - CLANGXX_7=/usr/bin/clang++-7 \ - CLANG_9=/usr/bin/clang-9 \ - CLANGXX_9=/usr/bin/clang++-9 \ + CLANG_14=/usr/bin/clang-14 \ + CLANGXX_14=/usr/bin/clang++-14 \ BAZEL_6_3_2=6.3.2 \ BAZEL_7_1_2=7.1.2 @@ -40,7 +36,7 @@ RUN useradd -m -s /bin/bash conan && \ ENV HOME /home/conan ENV PYENV_ROOT $HOME/.pyenv ENV PATH $PYENV_ROOT/bin:$PYENV_ROOT/shims:/usr/bin:/bin:$PATH - + RUN curl https://pyenv.run | bash RUN pyenv install 3.6.15 && \ @@ -65,19 +61,19 @@ RUN apt-get install -y --no-install-recommends fish && \ rm -rf /var/lib/apt/lists/* RUN wget https://github.com/Kitware/CMake/releases/download/v3.15.7/cmake-3.15.7-Linux-x86_64.tar.gz && \ - tar -xvzf cmake-3.15.7-Linux-x86_64.tar.gz && \ - mv cmake-3.15.7-Linux-x86_64 /usr/share/cmake-3.15.7 && \ + tar --transform='s/cmake-3.15.7-Linux-x86_64/cmake-3.15.7-linux-x86_64/' -xvzf cmake-3.15.7-Linux-x86_64.tar.gz && \ + mv cmake-3.15.7-linux-x86_64 /usr/share/cmake-3.15.7 && \ wget https://github.com/Kitware/CMake/releases/download/v3.16.9/cmake-3.16.9-Linux-x86_64.tar.gz && \ - tar -xvzf cmake-3.16.9-Linux-x86_64.tar.gz && \ - mv cmake-3.16.9-Linux-x86_64 /usr/share/cmake-3.16.9 && \ + tar --transform='s/cmake-3.16.9-Linux-x86_64/cmake-3.16.9-linux-x86_64/' -xvzf cmake-3.16.9-Linux-x86_64.tar.gz && \ + mv cmake-3.16.9-linux-x86_64 /usr/share/cmake-3.16.9 && \ wget https://github.com/Kitware/CMake/releases/download/v3.17.5/cmake-3.17.5-Linux-x86_64.tar.gz && \ - tar -xvzf cmake-3.17.5-Linux-x86_64.tar.gz && \ - mv cmake-3.17.5-Linux-x86_64 /usr/share/cmake-3.17.5 && \ + tar --transform='s/cmake-3.17.5-Linux-x86_64/cmake-3.17.5-linux-x86_64/' -xvzf cmake-3.17.5-Linux-x86_64.tar.gz && \ + mv cmake-3.17.5-linux-x86_64 /usr/share/cmake-3.17.5 && \ wget https://github.com/Kitware/CMake/releases/download/v3.19.7/cmake-3.19.7-Linux-x86_64.tar.gz && \ - tar -xvzf cmake-3.19.7-Linux-x86_64.tar.gz && \ - mv cmake-3.19.7-Linux-x86_64 /usr/share/cmake-3.19.7 && \ + tar --transform='s/cmake-3.19.7-Linux-x86_64/cmake-3.19.7-linux-x86_64/' -xvzf cmake-3.19.7-Linux-x86_64.tar.gz && \ + mv cmake-3.19.7-linux-x86_64 /usr/share/cmake-3.19.7 && \ wget https://github.com/Kitware/CMake/releases/download/v3.23.5/cmake-3.23.5-Linux-x86_64.tar.gz && \ - tar -xvzf cmake-3.23.5-Linux-x86_64.tar.gz && \ + tar --transform='s/cmake-3.23.5-Linux-x86_64/cmake-3.23.5-linux-x86_64/' -xvzf cmake-3.23.5-Linux-x86_64.tar.gz && \ mv cmake-3.23.5-linux-x86_64 /usr/share/cmake-3.23.5 && \ update-alternatives --install /usr/bin/cmake cmake /usr/share/cmake-3.15.7/bin/cmake 10 && \ update-alternatives --install /usr/bin/cmake cmake /usr/share/cmake-3.16.9/bin/cmake 20 && \ @@ -88,25 +84,21 @@ RUN wget https://github.com/Kitware/CMake/releases/download/v3.15.7/cmake-3.15.7 rm cmake-*.tar.gz RUN apt-get update && apt-get install -y --no-install-recommends \ - gcc-7 g++-7 \ gcc-9 g++-9 \ gcc-11 g++-11 \ - clang-7 clang++-7 \ - clang-9 clang++-9 && \ - update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 20 && \ + clang-14 clang++-14 && \ update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 10 && \ update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 30 && \ - update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-7 20 && \ update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 10 && \ update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 30 && \ - update-alternatives --install /usr/bin/clang clang /usr/bin/clang-7 20 && \ - update-alternatives --install /usr/bin/clang clang /usr/bin/clang-9 10 && \ - update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-7 20 && \ - update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-9 10 && \ + update-alternatives --install /usr/bin/clang clang /usr/bin/clang-14 10 && \ + update-alternatives --install /usr/bin/clang clang /usr/bin/clang-11 30 && \ + update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-14 10 && \ + update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-11 30 && \ update-alternatives --set gcc /usr/bin/gcc-9 && \ update-alternatives --set g++ /usr/bin/g++-9 && \ - update-alternatives --set clang /usr/bin/clang-9 && \ - update-alternatives --set clang++ /usr/bin/clang++-9 && \ + update-alternatives --set clang /usr/bin/clang-14 && \ + update-alternatives --set clang++ /usr/bin/clang++-14 && \ rm -rf /var/lib/apt/lists/* RUN wget https://dl.google.com/android/repository/android-ndk-r23c-linux.zip && \