v2.4.0: Upgrade pgTAP to 1.3.0

- Upgraded pgTAP to 1.3.0.

- Updated PostgreSQL 16 beta 2 to PostgreSQL beta 3

- Add .gitattributes to make it clear that the contents of opt/pgtap are
  generated.

Signed-off-by: Austin Ziegler <[email protected]>

.gitattributes

@@ -0,0 +1 @@
+opt/**/*.sql -diff -merge linguist-generated=true

Changelog.md

@@ -1,8 +1,14 @@
 # kineticcafe/sqitch-pgtap Changelog
 
+## 2.4.0 / 2023-08-16
+
+- Upgraded pgTAP to 1.3.0.
+
+- Updated PostgreSQL 16 beta 2 to PostgreSQL beta 3
+
 ## 2.3.0 / 2023-08-03
 
-- Upgraded sqitch version to 1.4.0
+- Upgraded sqitch version to 1.4.0.
 
 - Upgraded pgTAP to 1.2.1 at theory/pgtap@96a7a416311ea5f2fa140f59cfdf7c7afbded17c.
 

Dockerfile

@@ -4,7 +4,7 @@ ARG PG_PROVE_VERSION
 ARG PGTAP_VERSION
 ARG SQITCH_VERSION
 
-ENV __DOCKERFILE_VERSION__=2.1.0
+ENV __DOCKERFILE_VERSION__=2.4.0
 
 RUN apk update \
     && apk add --no-cache --update \

Justfile

@@ -1,6 +1,6 @@
 pg_prove_version := `jq -r .pg_prove.version < package-versions.json`
 pgtap_version := `jq -r .pgtap.version < package-versions.json`
-pgtap_hashref := `jq -r .pgtap.hashref < package-versions.json`
+pgtap_hashref := `jq -r '.pgtap.hashref // empty' < package-versions.json`
 sqitch_version := `jq -r .sqitch.version < package-versions.json`
 image_version := `jq -r .VERSION < package-versions.json`
 
@@ -39,7 +39,7 @@ pgtap-set-version NEW_VERSION NEW_HASHREF="":
   declare new_hashref
   new_hashref="{{ NEW_HASHREF }}"
 
-  if [[ -n "${new_hashref}"]]; then
+  if [[ -n "${new_hashref}" ]]; then
     just _update_package_versions pgtap.hashref "${new_hashref}"
   fi
 

Maintenance.md

@@ -116,3 +116,6 @@ Docker base images must be kept up to date. These should be updated based on the
 latest available Alpine version for each version of PostgreSQL used in
 `build/pgtap/Dockerfile`, and the final release should be the latest available
 Alpine version.
+
+[pgxn]: https://pgxn.org/dist/pgtap
+[casey/just]: https://github.com/casey/just

README.md

@@ -11,28 +11,28 @@ variables or on the command-line.
 
 This version of the container includes:
 
-- pgTAP 1.2.1 (via git at `96a7a416311ea5f2fa140f59cfdf7c7afbded17c`)
+- pgTAP 1.3.0 (from [PGXN][])
   - Support for PostgreSQL 9.6, 10, 11, 12, 13, 14, and 15
 - pg_prove 3.36
 - Sqitch 1.4.0
 
 The version of pgTAP is installed and uninstalled as needed; unit test files
-_must not_ `CREATE EXTENSION pgtap`.
+_must not_ include `CREATE EXTENSION pgtap`.
 
 These images can be pulled either from Docker Hub
-(`kineticcafe/sqitch-pgtap:2.3`) or the GitHub Container Registry
-(`ghcr.io/kineticcafe/sqitch-pgtap:2.3`).
+(`kineticcafe/sqitch-pgtap:2.4`) or the GitHub Container Registry
+(`ghcr.io/kineticcafe/sqitch-pgtap:2.4`).
 
 ## `run` script Commands
 
 The `run` script is recommended for running everything as it manages environment
 variable configuration for each run. The `run` script will pull from
-`ghcr.io/kineticcafe/sqitch-pgtap:2.3` by default; this can be overridden by
+`ghcr.io/kineticcafe/sqitch-pgtap:2` by default; this can be overridden by
 using `$IMAGE`:
 
 ```console
 $ IMAGE=kineticcafe/sqitch-pgtap:latest ./run version
-[gchr.io/]kineticcafe/sqitch-pgtap:2.3.0
+[gchr.io/]kineticcafe/sqitch-pgtap:2.4.0
 
   sqitch (App::Sqitch) v1.4.0
   pgtap 1.2.1 (96a7a416311ea5f2fa140f59cfdf7c7afbded17c)
@@ -89,3 +89,4 @@ $ IMAGE=kineticcafe/sqitch-pgtap:latest ./run version
 [pgtap]: https://pgtap.org
 [sqitch]: https://sqitch.org
 [theory/tap-parser-sourcehandler-pgtap]: https://github.com/theory/tap-parser-sourcehandler-pgtap
+[pgxn]: https://pgxn.org/dist/pgtap/

build/pgtap/Dockerfile

@@ -1,4 +1,4 @@
-FROM postgres:16beta2-alpine3.18 AS build-pgtap-psql-16
+FROM postgres:16beta3-alpine3.18 AS build-pgtap-psql-16
 
 ARG PGTAP_VERSION