Skip to content

Commit 46a84dc

Browse files
ImreSamuImreSamu
committed
fix jit alpine test
1 parent 6c60c3e commit 46a84dc

File tree

12 files changed

+166
-45
lines changed

12 files changed

+166
-45
lines changed

‎.github/workflows/buildx.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
make-docker-images:
1616
strategy:
17-
fail-fast: false
17+
# fail-fast: false
1818
matrix:
1919
#
2020
platforms: ['linux/arm64','linux/arm/v7','linux/arm/v6','linux/386','linux/ppc64le']

‎10-2.5/alpine/Dockerfile‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,21 @@ RUN set -eux \
9999
&& mkdir /tempdb \
100100
&& chown -R postgres:postgres /tempdb \
101101
&& su postgres -c 'pg_ctl -D /tempdb init' \
102-
# testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
103-
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
104-
&& su postgres -c 'psql -c "SHOW JIT;"' \
105-
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
102+
\
103+
&& if [ "10" == "10" ]; then \
104+
set -eux \
105+
# pg ==10 : testing with huge_pages=off ---> for the buildx/qemu workflow
106+
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -D /tempdb start' \
107+
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
108+
; \
109+
else \
110+
set -eux \
111+
# pg >=11 : testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
112+
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
113+
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
114+
&& su postgres -c 'psql -c "SHOW JIT;"' \
115+
; \
116+
fi \
106117
\
107118
&& cd regress \
108119
&& make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \

‎10-3.2/alpine/Dockerfile‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,21 @@ RUN set -eux \
9999
&& mkdir /tempdb \
100100
&& chown -R postgres:postgres /tempdb \
101101
&& su postgres -c 'pg_ctl -D /tempdb init' \
102-
# testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
103-
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
104-
&& su postgres -c 'psql -c "SHOW JIT;"' \
105-
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
102+
\
103+
&& if [ "10" == "10" ]; then \
104+
set -eux \
105+
# pg ==10 : testing with huge_pages=off ---> for the buildx/qemu workflow
106+
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -D /tempdb start' \
107+
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
108+
; \
109+
else \
110+
set -eux \
111+
# pg >=11 : testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
112+
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
113+
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
114+
&& su postgres -c 'psql -c "SHOW JIT;"' \
115+
; \
116+
fi \
106117
\
107118
&& cd regress \
108119
&& make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \

‎11-2.5/alpine/Dockerfile‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,21 @@ RUN set -eux \
9999
&& mkdir /tempdb \
100100
&& chown -R postgres:postgres /tempdb \
101101
&& su postgres -c 'pg_ctl -D /tempdb init' \
102-
# testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
103-
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
104-
&& su postgres -c 'psql -c "SHOW JIT;"' \
105-
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
102+
\
103+
&& if [ "11" == "10" ]; then \
104+
set -eux \
105+
# pg ==10 : testing with huge_pages=off ---> for the buildx/qemu workflow
106+
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -D /tempdb start' \
107+
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
108+
; \
109+
else \
110+
set -eux \
111+
# pg >=11 : testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
112+
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
113+
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
114+
&& su postgres -c 'psql -c "SHOW JIT;"' \
115+
; \
116+
fi \
106117
\
107118
&& cd regress \
108119
&& make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \

‎11-3.2/alpine/Dockerfile‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,21 @@ RUN set -eux \
9999
&& mkdir /tempdb \
100100
&& chown -R postgres:postgres /tempdb \
101101
&& su postgres -c 'pg_ctl -D /tempdb init' \
102-
# testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
103-
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
104-
&& su postgres -c 'psql -c "SHOW JIT;"' \
105-
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
102+
\
103+
&& if [ "11" == "10" ]; then \
104+
set -eux \
105+
# pg ==10 : testing with huge_pages=off ---> for the buildx/qemu workflow
106+
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -D /tempdb start' \
107+
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
108+
; \
109+
else \
110+
set -eux \
111+
# pg >=11 : testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
112+
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
113+
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
114+
&& su postgres -c 'psql -c "SHOW JIT;"' \
115+
; \
116+
fi \
106117
\
107118
&& cd regress \
108119
&& make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \

‎12-3.2/alpine/Dockerfile‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,21 @@ RUN set -eux \
9999
&& mkdir /tempdb \
100100
&& chown -R postgres:postgres /tempdb \
101101
&& su postgres -c 'pg_ctl -D /tempdb init' \
102-
# testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
103-
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
104-
&& su postgres -c 'psql -c "SHOW JIT;"' \
105-
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
102+
\
103+
&& if [ "12" == "10" ]; then \
104+
set -eux \
105+
# pg ==10 : testing with huge_pages=off ---> for the buildx/qemu workflow
106+
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -D /tempdb start' \
107+
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
108+
; \
109+
else \
110+
set -eux \
111+
# pg >=11 : testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
112+
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
113+
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
114+
&& su postgres -c 'psql -c "SHOW JIT;"' \
115+
; \
116+
fi \
106117
\
107118
&& cd regress \
108119
&& make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \

‎13-3.2/alpine/Dockerfile‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,21 @@ RUN set -eux \
9999
&& mkdir /tempdb \
100100
&& chown -R postgres:postgres /tempdb \
101101
&& su postgres -c 'pg_ctl -D /tempdb init' \
102-
# testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
103-
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
104-
&& su postgres -c 'psql -c "SHOW JIT;"' \
105-
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
102+
\
103+
&& if [ "13" == "10" ]; then \
104+
set -eux \
105+
# pg ==10 : testing with huge_pages=off ---> for the buildx/qemu workflow
106+
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -D /tempdb start' \
107+
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
108+
; \
109+
else \
110+
set -eux \
111+
# pg >=11 : testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
112+
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
113+
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
114+
&& su postgres -c 'psql -c "SHOW JIT;"' \
115+
; \
116+
fi \
106117
\
107118
&& cd regress \
108119
&& make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \

‎14-3.2/alpine/Dockerfile‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,21 @@ RUN set -eux \
9999
&& mkdir /tempdb \
100100
&& chown -R postgres:postgres /tempdb \
101101
&& su postgres -c 'pg_ctl -D /tempdb init' \
102-
# testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
103-
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
104-
&& su postgres -c 'psql -c "SHOW JIT;"' \
105-
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
102+
\
103+
&& if [ "14" == "10" ]; then \
104+
set -eux \
105+
# pg ==10 : testing with huge_pages=off ---> for the buildx/qemu workflow
106+
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -D /tempdb start' \
107+
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
108+
; \
109+
else \
110+
set -eux \
111+
# pg >=11 : testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
112+
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
113+
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
114+
&& su postgres -c 'psql -c "SHOW JIT;"' \
115+
; \
116+
fi \
106117
\
107118
&& cd regress \
108119
&& make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \

‎14-3.3.0rc2/alpine/Dockerfile‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,21 @@ RUN set -eux \
9999
&& mkdir /tempdb \
100100
&& chown -R postgres:postgres /tempdb \
101101
&& su postgres -c 'pg_ctl -D /tempdb init' \
102-
# testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
103-
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
104-
&& su postgres -c 'psql -c "SHOW JIT;"' \
105-
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
102+
\
103+
&& if [ "14" == "10" ]; then \
104+
set -eux \
105+
# pg ==10 : testing with huge_pages=off ---> for the buildx/qemu workflow
106+
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -D /tempdb start' \
107+
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
108+
; \
109+
else \
110+
set -eux \
111+
# pg >=11 : testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
112+
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
113+
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
114+
&& su postgres -c 'psql -c "SHOW JIT;"' \
115+
; \
116+
fi \
106117
\
107118
&& cd regress \
108119
&& make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \

‎15beta3-3.2/alpine/Dockerfile‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,21 @@ RUN set -eux \
9999
&& mkdir /tempdb \
100100
&& chown -R postgres:postgres /tempdb \
101101
&& su postgres -c 'pg_ctl -D /tempdb init' \
102-
# testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
103-
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
104-
&& su postgres -c 'psql -c "SHOW JIT;"' \
105-
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
102+
\
103+
&& if [ "15beta3" == "10" ]; then \
104+
set -eux \
105+
# pg ==10 : testing with huge_pages=off ---> for the buildx/qemu workflow
106+
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -D /tempdb start' \
107+
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
108+
; \
109+
else \
110+
set -eux \
111+
# pg >=11 : testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
112+
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
113+
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
114+
&& su postgres -c 'psql -c "SHOW JIT;"' \
115+
; \
116+
fi \
106117
\
107118
&& cd regress \
108119
&& make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \

0 commit comments

Comments
 (0)