From 092f5c066268c2c54f0bf262711afd6b067501d9 Mon Sep 17 00:00:00 2001 From: jnasbyupgrade Date: Fri, 31 Jul 2026 15:53:41 -0500 Subject: [PATCH] base.mk: rename PGTLE_VERSION to PGXNTOOL_PGTLE_VERSION make auto-imports environment variables of the same name as an unset make variable, and `pgtle`'s version-limiting variable was named PGTLE_VERSION -- also a natural name for a CI job's "which pg_tle to test against" env var. When such an env var was set, `make pgtle`/`make run-pgtle` silently generated/ran the wrong version-range directory instead of erroring. Renamed to PGXNTOOL_PGTLE_VERSION to avoid the collision. Updated README.asc/README.html, CLAUDE.md, and HISTORY.asc accordingly. Related changes in pgxntool-test: - test/sequential/04-pgtle.bats updated to use PGXNTOOL_PGTLE_VERSION - Added a regression test confirming a PGTLE_VERSION env var no longer affects `make pgtle` Fixes #78. Co-Authored-By: Claude --- CLAUDE.md | 2 +- HISTORY.asc | 13 +++++++++++++ README.asc | 8 ++++---- README.html | 12 ++++++------ base.mk | 8 ++++++-- 5 files changed, 30 insertions(+), 13 deletions(-) diff --git a/CLAUDE.md b/CLAUDE.md index 5db8c95..0b0e23e 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -219,7 +219,7 @@ When tests fail, examine the diff output carefully. The actual test output in `t pgxntool can generate pg_tle (Trusted Language Extensions) registration SQL for deploying extensions in AWS RDS/Aurora without filesystem access. -**Usage:** `make pgtle` or `make pgtle PGTLE_VERSION=1.5.0+` +**Usage:** `make pgtle` or `make pgtle PGXNTOOL_PGTLE_VERSION=1.5.0+` **Output:** `pg_tle/{version_range}/{extension}.sql` diff --git a/HISTORY.asc b/HISTORY.asc index 231809f..de3aae3 100644 --- a/HISTORY.asc +++ b/HISTORY.asc @@ -1,3 +1,16 @@ +STABLE +------ +== Rename `PGTLE_VERSION` to `PGXNTOOL_PGTLE_VERSION` +`make pgtle`'s version-limiting variable was named `PGTLE_VERSION`, which +make auto-imports from an identically-named environment variable. That name +is also a natural choice for a CI job's "which pg_tle to test against" env +var -- when one was set, `make pgtle`/`make run-pgtle` silently misbehaved +instead of erroring. Renamed to `PGXNTOOL_PGTLE_VERSION` to avoid the +collision. If you invoke `make pgtle PGTLE_VERSION=...` directly, update it +to `PGXNTOOL_PGTLE_VERSION`. + +Issues fixed in this release: #78 + 2.2.0 ----- == Add `check-stale-expected` to catch orphaned test/expected files diff --git a/README.asc b/README.asc index a799c7c..2246791 100644 --- a/README.asc +++ b/README.asc @@ -308,10 +308,10 @@ Generates pg_tle (Trusted Language Extensions) registration SQL files for deploy `make pgtle` generates SQL files in `pg_tle/` subdirectories organized by pg_tle version ranges. For version range details, see `pgtle_versions.md`. -Set `PGTLE_VERSION` on the command line to limit generation to the single version range that value falls into, instead of every known range: +Set `PGXNTOOL_PGTLE_VERSION` on the command line to limit generation to the single version range that value falls into, instead of every known range: ---- -make pgtle PGTLE_VERSION=1.5.0 +make pgtle PGXNTOOL_PGTLE_VERSION=1.5.0 ---- === check-pgtle @@ -665,9 +665,9 @@ make dist PGXN_REMOTE=upstream Default: auto-detected, the first of `asciidoctor` or `asciidoc` found on `PATH`. Path to the Asciidoc processor used to build `.html` files from `$(ASCIIDOC_EXTS)` source files. Override if the processor you want isn't first on `PATH`, or isn't on `PATH` at all. See <<_document_handling>>. -=== PGTLE_VERSION +=== PGXNTOOL_PGTLE_VERSION -Default: unset (generates every known pg_tle version range). Set on the command line to limit `make pgtle` to the single version range this value falls into. See <<_pgtle>>. +Default: unset (generates every known pg_tle version range). Set on the command line to limit `make pgtle` to the single version range this value falls into. Not named `PGTLE_VERSION`: make auto-imports same-named environment variables, and that name collided silently with CI jobs that set a `PGTLE_VERSION` env var for an unrelated purpose (which pg_tle to test against). See <<_pgtle>>. === PG_CONFIG diff --git a/README.html b/README.html index 36d3cf5..576cdc6 100644 --- a/README.html +++ b/README.html @@ -499,7 +499,7 @@

PGXNtool