Skip to content

[PGPRO-16769] Fix Travis CI failures #288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arseny114 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[PGPRO-16769] Fix Travis CI failures #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ RUN apk add --no-cache \
coreutils linux-headers \
make musl-dev gcc bison flex \
zlib-dev libedit-dev \
pkgconf icu-dev clang clang15 clang-analyzer;
pkgconf icu-dev clang clang-analyzer;

# Need this for Travis CI to pass
RUN if [ "${PG_VERSION}" == "13" ] ; then apk add --no-cache clang19; fi
RUN if [ "${PG_VERSION}" == "11" ] ; then apk add --no-cache clang15; fi

# Install fresh valgrind
RUN apk add valgrind \
Expand Down
6 changes: 5 additions & 1 deletion run_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,11 @@ if [ "$LEVEL" = "scan-build" ] || \
[ "$LEVEL" = "nightmare" ]; then

# perform static analyzis
scan-build --status-bugs make USE_PGXS=1 || status=$?
if [ "${PG_VERSION%.*}" = "11" ]; then
scan-build --status-bugs make USE_PGXS=1 CLANG=clang-15 || status=$?
else
scan-build --status-bugs make USE_PGXS=1 CLANG=clang || status=$?
fi

# something's wrong, exit now!
if [ $status -ne 0 ]; then exit 1; fi
Expand Down