postgrespro · sokolcati · Jul 5, 2024 · Oct 23, 2024
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,10 @@
+# Don't send some content to the Docker host when building
+travis
+.git
+.travis.yml
+
+*.gcno
+*.gcda
+*.gcov
+*.so
+*.o
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 /log/
 /results/
 /tmp_check/
+*.bc
 *.so
 *.o
 jsquery_gram.c

diff --git a/.travis.yml b/.travis.yml
@@ -1,35 +1,35 @@
-os:
-  - linux
+os: linux
 
-sudo: required
-dist: trusty
+dist: jammy
 
 language: c
 
-compiler:
-  - clang
-  - gcc
-
-before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -y install -qq wget ca-certificates; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then source ./travis/dep-ubuntu-postgres.sh; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then source ./travis/dep-ubuntu-llvm.sh; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq; fi
+services:
+- docker
 
 env:
-  global:
-    - LLVM_VER=4.0
-  matrix:
-    - PG_VER=11  CHECK_TYPE=normal
-    - PG_VER=11  CHECK_TYPE=static
-    - PG_VER=10  CHECK_TYPE=normal
-    - PG_VER=10  CHECK_TYPE=static
-    - PG_VER=10.5  CHECK_TYPE=valgrind
-    - PG_VER=9.6 CHECK_TYPE=normal
-    - PG_VER=9.6 CHECK_TYPE=static
-    - PG_VER=9.5 CHECK_TYPE=normal
-    - PG_VER=9.5 CHECK_TYPE=static
-    - PG_VER=9.4 CHECK_TYPE=normal
-    - PG_VER=9.4 CHECK_TYPE=static
-
-script: bash ./travis/pg-travis-test.sh
+- PG_VER=17
+- PG_VER=16
+- PG_VER=15
+- PG_VER=14
+- PG_VER=13
+- PG_VER=12
+- PG_VER=11
+- PG_VER=10
+#- PG_VER=9.6
+#- PG_VER=9.5
+#- PG_VER=9.4
+
+jobs:
+  allow_failures:
+    - env: PG_VER=12
+    - env: PG_VER=11
+    - env: PG_VER=10
+
+before_install: cp travis/* .
+
+install:
+  - ./mk_dockerfile.sh
+  - docker-compose build
+
+script: docker-compose run $(bash <(curl -s https://codecov.io/env)) tests
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 JsQuery is released under the PostgreSQL License, a liberal Open Source license, similar to the BSD or MIT licenses.
 
-Copyright (c) 2014-2018, Postgres Professional
+Copyright (c) 2014-2024, Postgres Professional
 Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 Portions Copyright (c) 1994, The Regents of the University of California
 

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/postgrespro/jsquery.svg?branch=master)](https://travis-ci.org/postgrespro/jsquery)
+[![Build Status](https://app.travis-ci.com/postgrespro/jsquery.svg?branch=master)](https://app.travis-ci.com/postgrespro/jsquery)
 [![codecov](https://codecov.io/gh/postgrespro/jsquery/branch/master/graph/badge.svg)](https://codecov.io/gh/postgrespro/jsquery)
 [![GitHub license](https://img.shields.io/badge/license-PostgreSQL-blue.svg)](https://raw.githubusercontent.com/postgrespro/jsquery/master/LICENSE)
 

diff --git a/jsonb_gin_ops.c b/jsonb_gin_ops.c
@@ -4,7 +4,7 @@
  *	Support GIN over jsonb with jsquery operation
  *
  * Copyright (c) 2014, PostgreSQL Global Development Group
- * Portions Copyright (c) 2017-2021, Postgres Professional
+ * Portions Copyright (c) 2017-2024, Postgres Professional
  * Author: Alexander Korotkov <aekorotkov@gmail.com>
  *
  * IDENTIFICATION

diff --git a/jsquery.h b/jsquery.h
@@ -4,7 +4,7 @@
  *	Definitions of jsquery datatype
  *
  * Copyright (c) 2014, PostgreSQL Global Development Group
- * Portions Copyright (c) 2017-2021, Postgres Professional
+ * Portions Copyright (c) 2017-2024, Postgres Professional
  * Author: Teodor Sigaev <teodor@sigaev.ru>
  *
  * IDENTIFICATION

diff --git a/jsquery_constr.c b/jsquery_constr.c
@@ -4,7 +4,7 @@
  *	Functions and operations to manipulate jsquery
  *
  * Copyright (c) 2014, PostgreSQL Global Development Group
- * Portions Copyright (c) 2017-2021, Postgres Professional
+ * Portions Copyright (c) 2017-2024, Postgres Professional
  * Author: Teodor Sigaev <teodor@sigaev.ru>
  *
  * IDENTIFICATION

diff --git a/jsquery_extract.c b/jsquery_extract.c
@@ -4,7 +4,7 @@
  *	Functions and operations to support jsquery in indexes
  *
  * Copyright (c) 2014, PostgreSQL Global Development Group
- * Portions Copyright (c) 2017-2021, Postgres Professional
+ * Portions Copyright (c) 2017-2024, Postgres Professional
  * Author: Alexander Korotkov <aekorotkov@gmail.com>
  *
  * IDENTIFICATION

diff --git a/jsquery_gram.y b/jsquery_gram.y
@@ -4,7 +4,7 @@
  *	Grammar definitions for jsquery datatype
  *
  * Copyright (c) 2014, PostgreSQL Global Development Group
- * Portions Copyright (c) 2017-2021, Postgres Professional
+ * Portions Copyright (c) 2017-2024, Postgres Professional
  * Author: Teodor Sigaev <teodor@sigaev.ru>
  *
  * IDENTIFICATION

diff --git a/jsquery_io.c b/jsquery_io.c
@@ -4,7 +4,7 @@
  *	I/O functions for jsquery datatype
  *
  * Copyright (c) 2014, PostgreSQL Global Development Group
- * Portions Copyright (c) 2016-2021, Postgres Professional
+ * Portions Copyright (c) 2016-2024, Postgres Professional
  * Author: Teodor Sigaev <teodor@sigaev.ru>
  *
  * IDENTIFICATION

diff --git a/jsquery_op.c b/jsquery_op.c
@@ -4,7 +4,7 @@
  *	Functions and operations over jsquery/jsonb datatypes
  *
  * Copyright (c) 2014, PostgreSQL Global Development Group
- * Portions Copyright (c) 2017-2021, Postgres Professional
+ * Portions Copyright (c) 2017-2024, Postgres Professional
  * Author: Teodor Sigaev <teodor@sigaev.ru>
  *
  * IDENTIFICATION

diff --git a/jsquery_scan.l b/jsquery_scan.l
@@ -4,7 +4,7 @@
  *     Lexical parser for jsquery datatype
  *
  * Copyright (c) 2014, PostgreSQL Global Development Group
- * Portions Copyright (c) 2017-2021, Postgres Professional
+ * Portions Copyright (c) 2017-2024, Postgres Professional
  * Author: Teodor Sigaev <teodor@sigaev.ru>
  *
  * IDENTIFICATION

diff --git a/jsquery_support.c b/jsquery_support.c
@@ -4,7 +4,7 @@
  *	Functions and operations to support jsquery
  *
  * Copyright (c) 2014, PostgreSQL Global Development Group
- * Portions Copyright (c) 2017-2021, Postgres Professional
+ * Portions Copyright (c) 2017-2024, Postgres Professional
  * Author: Teodor Sigaev <teodor@sigaev.ru>
  *
  * IDENTIFICATION

diff --git a/travis/Dockerfile.in b/travis/Dockerfile.in
@@ -0,0 +1,33 @@
+FROM postgres:${PG_VERSION}-alpine
+
+# Install dependencies
+RUN apk add --no-cache \
+	linux-headers \
+	openssl curl \
+	perl perl-ipc-run perl-dev perl-app-cpanminus perl-dbi \
+	make musl-dev gcc bison flex coreutils \
+	zlib-dev libedit-dev \
+	pkgconf icu-dev clang clang15 clang-analyzer;
+
+# Environment
+ENV LANG=C.UTF-8 PGDATA=/pg/data
+
+# Make directories
+RUN	mkdir -p ${PGDATA} && \
+	mkdir -p /pg/testdir
+
+COPY run_tests.sh /run.sh
+RUN chmod 755 /run.sh
+
+COPY . /pg/testdir
+WORKDIR /pg/testdir
+
+# Grant privileges
+RUN	chown postgres:postgres ${PGDATA} && \
+	chown -R postgres:postgres /pg/testdir && \
+	chown postgres:postgres /usr/local/include/postgresql/server/ && \
+	chmod a+rwx /usr/local/lib/postgresql && \
+	chmod a+rwx /usr/local/share/postgresql/extension
+
+USER postgres
+ENTRYPOINT LEVEL=${LEVEL} /run.sh
diff --git a/travis/dep-ubuntu-llvm.sh b/travis/dep-ubuntu-llvm.sh
diff --git a/travis/dep-ubuntu-postgres.sh b/travis/dep-ubuntu-postgres.sh
diff --git a/travis/docker-compose.yml b/travis/docker-compose.yml
@@ -0,0 +1,3 @@
+services:
+  tests:
+    build: .
diff --git a/travis/llvm-snapshot.gpg.key b/travis/llvm-snapshot.gpg.key
diff --git a/travis/mk_dockerfile.sh b/travis/mk_dockerfile.sh
@@ -0,0 +1,16 @@
+if [ -z ${PG_VERSION+x} ]; then
+	echo PG_VERSION is not set!
+	exit 1
+fi
+
+if [ -z ${LEVEL+x} ]; then
+	LEVEL=standard
+fi
+
+echo PG_VERSION=${PG_VERSION}
+echo LEVEL=${LEVEL}
+
+sed \
+	-e 's/${PG_VERSION}/'${PG_VERSION}/g \
+	-e 's/${LEVEL}/'${LEVEL}/g \
+Dockerfile.in > Dockerfile