Separate tests for Postgres 11 and 12.

Author: mpartel

.github/workflows/tests.yml renamed to .github/workflows/tests-pg11.yml

@@ -1,4 +1,4 @@
-name: Tests
+name: Tests on PG11
 
 on: [push]
 
@@ -11,4 +11,4 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Build and run tests in Docker
-      run: env USE_DOCKER=1 ./build-and-test.sh
+      run: env USE_DOCKER=1 POSTGRES_VERSION=11 ./build-and-test.sh

.github/workflows/tests-pg12.yml

@@ -0,0 +1,14 @@
+name: Tests on PG12
+
+on: [push]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-18.04
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build and run tests in Docker
+      run: env USE_DOCKER=1 POSTGRES_VERSION=12 ./build-and-test.sh

Dockerfile.test

@@ -1,26 +1,31 @@
 FROM ubuntu:18.04
 
-ARG POSTGRES_VERSION=11
-
 RUN apt-get update \
  && apt-get install -y curl gnupg2 \
  && echo "deb http://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
  && curl -sL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
  && apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-      build-essential \
-      postgresql-${POSTGRES_VERSION} \
-      postgresql-server-dev-${POSTGRES_VERSION} \
-      ruby \
-      sudo \
+        build-essential \
+        ruby \
+        sudo \
  && apt-get clean \
  && rm -Rf /var/lib/apt/lists/*
 
-RUN sudo /etc/init.d/postgresql restart \
- && sudo -u postgres createuser -s root
+# Compiling the protobuf library is quite slow, so do this before installing the correct Postgres version
+COPY build-protobuf-library.sh /app/
+RUN /app/build-protobuf-library.sh
+
+ARG POSTGRES_VERSION=11
 
-COPY Makefile /app/
-RUN make -C app protoc
+RUN apt-get update \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+        postgresql-${POSTGRES_VERSION} \
+        postgresql-server-dev-${POSTGRES_VERSION} \
+ && apt-get clean \
+ && rm -Rf /var/lib/apt/lists/* \
+ && /etc/init.d/postgresql restart \
+ && sudo -u postgres createuser -s root
 
-COPY *.hpp *.cpp *.rb *.sh *.sql *.control *.md /app/
 COPY /test_protos /app/test_protos
+COPY Makefile *.hpp *.cpp *.rb *.sh *.sql *.control *.md /app/

Makefile

@@ -1,6 +1,6 @@
 
-PROTOBUF_VERSION=3.11.2
-PROTOBUF_ROOT=third_party/protobuf-$(PROTOBUF_VERSION)
+
+PROTOBUF_ROOT=third_party/protobuf
 PROTOC=$(PROTOBUF_ROOT)/src/protoc
 
 MODULE_big = postgres_protobuf
@@ -33,18 +33,15 @@ clean: pb_clean
 
 protoc: $(PROTOC)
 
-# Hack to get protobuf headers before building any of our stuff
+# Hack to get protobuf headers and libraries before building any of our stuff
 $(OBJS) $(BC_FILES): $(PROTOC)
 
 # Instead of proper dependency tracking, it's easier to make all compilation units depend on all headers.
 # Good enough for a small project.
 $(OBJS) $(BC_FILES): $(wildcard *.hpp)
 
 $(PROTOC):
-	rm -Rf third_party/protobuf-*
-	mkdir -p third_party/
-	cd third_party && curl -L "https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOBUF_VERSION)/protobuf-cpp-$(PROTOBUF_VERSION).tar.gz" | tar xzf -
-	cd third_party/protobuf-$(PROTOBUF_VERSION) && ./configure --with-pic --enable-static && make -j16
+	./build-protobuf-library.sh
 
 sql/postgres_protobuf.sql: generate_test_cases.rb $(DESC_SET_FILES)
 	env PROTOC=$(PROTOC) ./generate_test_cases.rb sql

README.md

@@ -32,6 +32,8 @@ which means that field renames will break backwards- and forwards-compatibility.
 
 ## Installation
 
+Requires Postgres 11 or newer.
+
 Prerequisites for installing from source:
 
 - Postgres server headers (if you use the Postgres APT repo, install `postgresql-server-dev-$VERSION`)

build-and-test.sh

@@ -3,17 +3,20 @@ set -euxo pipefail
 
 cd "$(dirname "${0}")"
 
-if [ -n "${USE_DOCKER:-}" ]; then
-    docker build -f Dockerfile.test -t postgres-protobuf-test .
-    docker run postgres-protobuf-test env __IN_DOCKER=1 /app/build-and-test.sh
+POSTGRES_VERSION=${POSTGRES_VERSION:-11}
+
+if [[ -n "${USE_DOCKER:-}" ]]; then
+    unset USE_DOCKER
+    docker build -f Dockerfile.test --build-arg=POSTGRES_VERSION="${POSTGRES_VERSION}" -t postgres-protobuf-test:"${POSTGRES_VERSION}" .
+    docker run postgres-protobuf-test:"${POSTGRES_VERSION}" env __IN_DOCKER=1 /app/build-and-test.sh
     exit $?
 fi
 
-if [ -n "${__IN_DOCKER:-}" ]; then
+if [[ -n "${__IN_DOCKER:-}" ]]; then
     sudo /etc/init.d/postgresql restart
 fi
 
-if [ -z "${NO_CLEAN:-}" ]; then
+if [[ -z "${NO_CLEAN:-}" ]]; then
     make clean
 fi
 

build-protobuf-library.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+set -euxo pipefail
+
+PROTOBUF_VERSION=3.11.2
+
+cd "$(dirname "${0}")"
+
+rm -Rf third_party/protobuf-*
+mkdir -p third_party/
+cd third_party
+curl -L "https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOBUF_VERSION}/protobuf-cpp-${PROTOBUF_VERSION}.tar.gz" | tar xzf -
+mv protobuf-"${PROTOBUF_VERSION}" protobuf
+cd protobuf
+./configure --with-pic --enable-static
+make -j16