Skip to content

Commit e9bf6a0

Browse files
committed
CI: stop installing clang on integration image
After switching to noble the clang installed on the container image began failing to compile nginx: ``` /usr/bin/clang -c -pipe -O -Wall -Wextra -Wpointer-arith -Wconditional-uninitialized -Wno-unused-parameter -Werror -g -I src/core -I src/event -I src/event/modules -I src/event/quic -I src/os/unix -I ../../pcre-8.45 -I objs -I src/http -I src/http/modules \ -o objs/addon/src/ngx_http_headers_more_headers_in.o \ ../../headers-more-nginx-module-0.34/src/ngx_http_headers_more_headers_in.c ../../headers-more-nginx-module-0.34/src/ngx_http_headers_more_headers_in.c:766:24: error: variable 'nelts' set but not used [-Werror,-Wunused-but-set-variable] 766 | int nelts; | ^ 1 error generated. make[1]: *** [objs/Makefile:1300: objs/addon/src/ngx_http_headers_more_headers_in.o] Error 1 make[1]: Leaving directory '/tmp/build/04d13fd0/bosh/src/tmp/nginx-work/nginx-src/nginx-1.29.3' make: *** [Makefile:10: build] Error 2 rake aborted! ``` Ex: https://bosh.ci.cloudfoundry.org/teams/main/pipelines/bosh-director/jobs/integration-postgres/builds/820#L6915ad9f:1953
1 parent cca5499 commit e9bf6a0

File tree

1 file changed

+0
-15
lines changed

1 file changed

+0
-15
lines changed

ci/dockerfiles/integration/Dockerfile

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -77,19 +77,6 @@ RUN apt-get update -y \
7777
vim \
7878
openssh-client \
7979
openssh-server \
80-
clang \
81-
clang-14 \
82-
lib32gcc-s1 \
83-
lib32stdc++6 \
84-
libc6-i386 \
85-
libclang-common-14-dev \
86-
libclang-cpp14 \
87-
libclang1-14 \
88-
libgc1 \
89-
libllvm14 \
90-
libobjc-11-dev \
91-
libobjc4 \
92-
llvm-14-linker-tools \
9380
mysql-client \
9481
libmysqlclient-dev \
9582
postgresql-client-${POSTGRES_MAJOR_VERSION} \
@@ -120,7 +107,6 @@ RUN yq_cli_path="/usr/local/bin/yq" \
120107
&& chmod +x "${yq_cli_path}"
121108

122109

123-
ENV CC="/usr/bin/clang" CXX="/usr/bin/clang++"
124110
RUN cd /tmp \
125111
&& curl --show-error -sL "${RUBY_INSTALL_URL}" \
126112
| tar -xzf - \
@@ -132,7 +118,6 @@ RUN cd /tmp \
132118
&& NUM_CPUS=$(grep -c ^processor /proc/cpuinfo) \
133119
&& ruby-install --jobs=${NUM_CPUS} --cleanup --system ruby ${RUBY_VERSION} \
134120
-- --disable-install-doc --disable-install-rdoc \
135-
-- CC=clang \
136121
&& gem update --system \
137122
&& bundle config --global path "${GEM_HOME}" \
138123
&& bundle config --global bin "${GEM_HOME}/bin"

0 commit comments

Comments
 (0)