Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitdf7612b

Browse files
committed
Merge branch 'master' into stable
2 parents2d3ea72 +4c7549e commitdf7612b

File tree

4 files changed

+23
-7
lines changed

4 files changed

+23
-7
lines changed

‎.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,5 @@ env:
2323
-PG_VERSION=10 CHECK_CODE=clang
2424
-PG_VERSION=10 CHECK_CODE=cppcheck
2525
-PG_VERSION=10 CHECK_CODE=false
26+
-PG_VERSION=11 CHECK_CODE=false
27+
-PG_VERSION=12 CHECK_CODE=false

‎Dockerfile.tmpl

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,28 @@ FROM postgres:${PG_VERSION}-alpine
33
ENV LANG=C.UTF-8 PGDATA=/pg/data
44

55
RUN if [ "${CHECK_CODE}" = "clang" ] ; then \
6-
echo 'http://dl-3.alpinelinux.org/alpine/edge/main' > /etc/apk/repositories; \
7-
apk --no-cache add clang-analyzer make musl-dev gcc; \
6+
# echo 'http://dl-3.alpinelinux.org/alpine/edge/main' > /etc/apk/repositories; \
7+
# Use alpine/v3.6/main instead of alpine/edge/main to fix version of clang to '8.*.*'
8+
apk --no-cache add clang-analyzer make musl-dev gcc --repository http://dl-cdn.alpinelinux.org/alpine/v3.6/main; \
89
fi
910

1011
RUN if [ "${CHECK_CODE}" = "cppcheck" ] ; then \
1112
apk --no-cache add cppcheck --repository http://dl-cdn.alpinelinux.org/alpine/v3.6/community; \
1213
fi
1314

1415
RUN if [ "${CHECK_CODE}" = "false" ] ; then \
15-
echo 'http://dl-3.alpinelinux.org/alpine/edge/main' > /etc/apk/repositories; \
16-
apk --no-cache add curl python3 gcc make musl-dev;\
16+
# echo 'http://dl-3.alpinelinux.org/alpine/edge/main' > /etc/apk/repositories; \
17+
# Use alpine/v3.6/main instead of alpine/edge/main to fix version of clang to '8.*.*'
18+
# Install clang as well, since LLVM is enabled in PG_VERSION >= 11 by default
19+
apk --no-cache add curl python3 gcc make musl-dev llvm clang clang-dev \
20+
--repository http://dl-cdn.alpinelinux.org/alpine/v3.6/community \
21+
--repository http://dl-cdn.alpinelinux.org/alpine/v3.6/main; \
1722
fi
1823

19-
RUN mkdir -p/pg/data && \
24+
RUN mkdir -p${PGDATA} && \
2025
mkdir /pg/src && \
2126
chown postgres:postgres ${PGDATA} && \
22-
chmod a+rwx /usr/local/lib/postgresql && \
27+
chmod-Ra+rwx /usr/local/lib/postgresql && \
2328
chmod a+rwx /usr/local/share/postgresql/extension
2429

2530
ADD . /pg/src

‎Makefile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,12 @@ endif
2626

2727
$(EXTENSION)--$(EXTVERSION).sql: setup.sql
2828
cat$^>$@
29+
30+
# Prepare the package for PGXN submission
31+
package: dist dist/$(EXTENSION)-$(EXTVERSION).zip
32+
33+
dist:
34+
mkdir -p dist
35+
36+
dist/$(EXTENSION)-$(EXTVERSION).zip:
37+
git archive --format zip --prefix=$(EXTENSION)-$(EXTVERSION)/ --output$@ master

‎run_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ make USE_PGXS=1 install
4848
status=$?
4949
if [$status-ne 0 ];thenexit$status;fi
5050

51-
# addpg_pathman to shared_preload_libraries and restart cluster 'test'
51+
# addpg_wait_sampling to shared_preload_libraries and restart cluster 'test'
5252
echo"shared_preload_libraries = 'pg_wait_sampling'">>$PGDATA/postgresql.conf
5353
echo"port = 55435">>$PGDATA/postgresql.conf
5454
pg_ctl start -l /tmp/postgres.log -w

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp