diff options
| author | Nikita Kozlovskiy <nikitka@gmail.com> | 2023-08-10 19:43:17 +0300 |
|---|---|---|
| committer | nkozlovskiy <nmk@ydb.tech> | 2023-08-10 21:21:11 +0300 |
| commit | 993b14e7a88dd7a0de9b1c96a9dd5cc4bcc38473 (patch) | |
| tree | bd96bbe2a097b9e4536af589f1719918c1918462 /.github/prewarm | |
| parent | ea943290d0e41b41d577fc00e8953dbb963a8cc4 (diff) | |
| download | ydb-993b14e7a88dd7a0de9b1c96a9dd5cc4bcc38473.tar.gz | |
fix prewarm cache and docker build, also add ubuntu-toolchain-r/test …
fix prewarm cache and docker build, also add ubuntu-toolchain-r/test …
Pull Request resolved: #326
Diffstat (limited to '.github/prewarm')
| -rw-r--r-- | .github/prewarm/ubuntu-1804.dockerfile | 9 | ||||
| -rw-r--r-- | .github/prewarm/ubuntu-2004.dockerfile | 2 | ||||
| -rw-r--r-- | .github/prewarm/ubuntu-2204.dockerfile | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/.github/prewarm/ubuntu-1804.dockerfile b/.github/prewarm/ubuntu-1804.dockerfile index 950990531f..b879d2f378 100644 --- a/.github/prewarm/ubuntu-1804.dockerfile +++ b/.github/prewarm/ubuntu-1804.dockerfile @@ -6,15 +6,16 @@ ENV TZ=Etc/UTC ## prepare system RUN apt-get update \ - && apt-get install -y wget gnupg lsb-release curl xz-utils tzdata \ + && apt-get install -y wget gnupg lsb-release curl xz-utils tzdata software-properties-common \ && wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc | apt-key add - \ - && echo "deb http://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/kitware.list >/dev/null \ + && echo "deb http://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/kitware.list \ && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \ - && echo "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-14 main" | tee /etc/apt/sources.list.d/llvm.list >/dev/null \ + && echo "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-14 main" > /etc/apt/sources.list.d/llvm.list \ + && add-apt-repository ppa:ubuntu-toolchain-r/test \ && apt-get update RUN apt-get install -y git cmake python3-pip ninja-build antlr3 m4 clang-14 lld-14 libidn11-dev libaio1 libaio-dev llvm-14 make \ - && pip3 install conan==1.59 \ + && pip3 install conan==1.59 grpcio-tools\ && (V=4.8.1; curl -L https://github.com/ccache/ccache/releases/download/v${V}/ccache-${V}-linux-x86_64.tar.xz | \ tar -xJ -C /usr/local/bin/ --strip-components=1 --no-same-owner ccache-${V}-linux-x86_64/ccache) diff --git a/.github/prewarm/ubuntu-2004.dockerfile b/.github/prewarm/ubuntu-2004.dockerfile index 6dadd9d3cf..8df906483b 100644 --- a/.github/prewarm/ubuntu-2004.dockerfile +++ b/.github/prewarm/ubuntu-2004.dockerfile @@ -15,6 +15,6 @@ RUN apt-get update \ RUN apt-get install -y git cmake python3-pip ninja-build antlr3 m4 clang-14 lld-14 libidn11-dev libaio1 libaio-dev llvm-14 \ - && pip3 install conan==1.59 \ + && pip3 install conan==1.59 grpcio-tools \ && (V=4.8.1; curl -L https://github.com/ccache/ccache/releases/download/v${V}/ccache-${V}-linux-x86_64.tar.xz | \ tar -xJ -C /usr/local/bin/ --strip-components=1 --no-same-owner ccache-${V}-linux-x86_64/ccache) diff --git a/.github/prewarm/ubuntu-2204.dockerfile b/.github/prewarm/ubuntu-2204.dockerfile index 27ecbc6639..4570b335b2 100644 --- a/.github/prewarm/ubuntu-2204.dockerfile +++ b/.github/prewarm/ubuntu-2204.dockerfile @@ -9,6 +9,6 @@ RUN apt-get update && apt-get install -y wget gnupg lsb-release curl xz-utils tz RUN apt-get install -y git cmake python3-pip ninja-build antlr3 m4 clang-14 lld-14 libidn11-dev libaio1 libaio-dev llvm-14 make \ - && pip3 install conan==1.59 \ + && pip3 install conan==1.59 grpcio-tools \ && (V=4.8.1; curl -L https://github.com/ccache/ccache/releases/download/v${V}/ccache-${V}-linux-x86_64.tar.xz | \ tar -xJ -C /usr/local/bin/ --strip-components=1 --no-same-owner ccache-${V}-linux-x86_64/ccache) |