update cmake to 3.23 and llvm to 16 in linux image
This commit is contained in:
parent
3ad97baa99
commit
a271c42e6f
3 changed files with 19 additions and 10 deletions
|
@ -5,7 +5,7 @@ RUN echo 'intall packages'; \
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
locales openssh-client gnupg ca-certificates \
|
locales openssh-client gnupg ca-certificates \
|
||||||
zip wget git \
|
zip wget git \
|
||||||
cmake gdb build-essential \
|
gdb build-essential \
|
||||||
ninja-build \
|
ninja-build \
|
||||||
libelf-dev libffi-dev gcc-multilib \
|
libelf-dev libffi-dev gcc-multilib \
|
||||||
# for llvm-libc tests that build mpfr and gmp from source
|
# for llvm-libc tests that build mpfr and gmp from source
|
||||||
|
@ -18,10 +18,19 @@ RUN echo 'intall packages'; \
|
||||||
# for llvm installation script
|
# for llvm installation script
|
||||||
sudo;
|
sudo;
|
||||||
|
|
||||||
|
# debian stable cmake is 3.18, we need to install a more recent version.
|
||||||
|
RUN wget --no-verbose -O /cmake.sh https://github.com/Kitware/CMake/releases/download/v3.23.3/cmake-3.23.3-linux-x86_64.sh; \
|
||||||
|
chmod +x /cmake.sh; \
|
||||||
|
mkdir -p /etc/cmake; \
|
||||||
|
/cmake.sh --prefix=/etc/cmake --skip-license; \
|
||||||
|
ln -s /etc/cmake/bin/cmake /usr/bin/cmake; \
|
||||||
|
cmake --version; \
|
||||||
|
rm /cmake.sh
|
||||||
|
|
||||||
# LLVM must be installed after prerequsite packages.
|
# LLVM must be installed after prerequsite packages.
|
||||||
ENV LLVM_VERSION=15
|
ENV LLVM_VERSION=16
|
||||||
RUN echo 'install llvm ${LLVM_VERSION}'; \
|
RUN echo 'install llvm ${LLVM_VERSION}'; \
|
||||||
wget https://apt.llvm.org/llvm.sh; \
|
wget --no-verbose https://apt.llvm.org/llvm.sh; \
|
||||||
chmod +x llvm.sh; \
|
chmod +x llvm.sh; \
|
||||||
./llvm.sh ${LLVM_VERSION};\
|
./llvm.sh ${LLVM_VERSION};\
|
||||||
apt-get update; \
|
apt-get update; \
|
||||||
|
|
|
@ -33,7 +33,7 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: test-debian
|
- name: test-debian
|
||||||
image: gcr.io/llvm-premerge-checks/test:latest
|
image: gcr.io/llvm-premerge-checks/buildkite-premerge-debian:latest
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
cpu: 30
|
cpu: 30
|
||||||
|
|
|
@ -10,16 +10,16 @@ if __name__ == '__main__':
|
||||||
|
|
||||||
d = json.dumps({
|
d = json.dumps({
|
||||||
'branch': 'main',
|
'branch': 'main',
|
||||||
'commit': 'd3fa067e699cf3ba4bc89f7d51d26f0faed7fa86',
|
'commit': '43b38696aa038a83b12850aab25377650e301cde',
|
||||||
'env': {
|
'env': {
|
||||||
'ph_log_level': 'DEBUG',
|
'ph_log_level': 'DEBUG',
|
||||||
#'ph_skip_linux': 'skip',
|
#'ph_skip_linux': 'skip',
|
||||||
#'ph_linux_agents': '{"queue": "linux-google-test"}',
|
'ph_linux_agents': '{"queue": "linux-google-test"}',
|
||||||
'ph_linux_agents': '{"queue": "linux-test"}',
|
#'ph_linux_agents': '{"queue": "linux-test"}',
|
||||||
# 'ph_linux_agents': '{"queue": "linux-clang15-test"}',
|
# 'ph_linux_agents': '{"queue": "linux-clang15-test"}',
|
||||||
# 'ph_skip_windows': 'skip',
|
'ph_skip_windows': 'skip',
|
||||||
#'ph_windows_agents': f'{{"name": "win-dev", "queue": "windows-test"}}',
|
#'ph_windows_agents': f'{{"name": "win-dev", "queue": "windows-test"}}',
|
||||||
'ph_windows_agents': '{"queue": "windows-test"}',
|
# 'ph_windows_agents': '{"queue": "windows-test"}',
|
||||||
# 'ph_scripts_refspec': 'windows-vscmd',
|
# 'ph_scripts_refspec': 'windows-vscmd',
|
||||||
# 'ph_projects': 'all',
|
# 'ph_projects': 'all',
|
||||||
'ph_skip_generated': 'skip',
|
'ph_skip_generated': 'skip',
|
||||||
|
|
Loading…
Reference in a new issue