Fix extension build fail for PG_VERSION >= 11 due to enabled LLVM

ololobus · ololobus · commit 08313b046c55 · 2020-01-09T14:55:56.000+03:00
diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl
@@ -13,8 +13,10 @@ RUN if [ "${CHECK_CODE}" = "cppcheck" ] ; then \
 	fi
 
 RUN if [ "${CHECK_CODE}" = "false" ] ; then \
-	echo 'http://dl-3.alpinelinux.org/alpine/edge/main' > /etc/apk/repositories; \
-	apk --no-cache add curl python3 gcc make musl-dev;\
+	# echo 'http://dl-3.alpinelinux.org/alpine/edge/main' > /etc/apk/repositories; \
+	# Use alpine/v3.6/main instead of alpine/edge/main to fix version of clang to '8.*.*'
+	# Install clang as well, since LLVM is enabled in PG_VERSION >= 11 by default
+	apk --no-cache add curl python3 gcc clang make musl-dev --repository http://dl-cdn.alpinelinux.org/alpine/v3.6/main;\
 	fi
 
 RUN mkdir -p /pg/data && \
diff --git a/run_tests.sh b/run_tests.sh
@@ -48,7 +48,7 @@ make USE_PGXS=1 install
 status=$?
 if [ $status -ne 0 ]; then exit $status; fi
 
-# add pg_pathman to shared_preload_libraries and restart cluster 'test'
+# add pg_wait_sampling to shared_preload_libraries and restart cluster 'test'
 echo "shared_preload_libraries = 'pg_wait_sampling'" >> $PGDATA/postgresql.conf
 echo "port = 55435" >> $PGDATA/postgresql.conf
 pg_ctl start -l /tmp/postgres.log -w
