Skip to content

Rename PG_TLE_BUILD_VERSION back to PGTLE_VERSION (#22) #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jnasbyupgrade wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −18
Open

Rename PG_TLE_BUILD_VERSION back to PGTLE_VERSION (#22) #65

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 6 additions & 18 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,19 +687,7 @@ jobs:
runs-on: ubuntu-latest
container: pgxn/pgxn-tools
env:
# NOT named PGTLE_VERSION: on the pgxntool version this job was
# written against, that collided with pgxntool's own Makefile variable
# of the same name (`pgtle:`'s
# `$(if $(PGTLE_VERSION),--pgtle-version $(PGTLE_VERSION))`), which Make
# auto-imports from the environment - `make run-pgtle` would silently
# generate into pg_tle/1.5.2/ (the literal version) instead of the
# correct range directory pg_tle/1.5.0+/, then fail when --run looked
# for the range directory and didn't find it. Filed as
# Postgres-Extensions/pgxntool#78, fixed upstream in pgxntool 2.3.0
# (renamed to PGXNTOOL_PGTLE_VERSION - see this repo's pgxntool bump).
# Keeping our own name distinct from EITHER of those regardless -
# still the simplest way to guarantee no future collision.
PG_TLE_BUILD_VERSION: "1.5.2"
PGTLE_VERSION: "1.5.2"
steps:
# A dedicated cluster, never shared with the other jobs in this
# workflow: pg_tle requires shared_preload_libraries and mixing
Expand Down Expand Up @@ -733,12 +721,12 @@ jobs:
# being registered via pg_tle -- not just count_nulls -- without
# hardcoding contrib/pgtap names.
run: bin/assert_fs_clean snapshot ${{ matrix.pg }} /tmp/control_baseline.txt
- name: Build and install pg_tle ${{ env.PG_TLE_BUILD_VERSION }}
- name: Build and install pg_tle ${{ env.PGTLE_VERSION }}
# flex/bison/libkrb5-dev aren't in the pgxn-tools image; pg_tle's build
# needs them (guc-file.l, and clientauth.c includes gssapi.h).
run: |
apt-get install -y flex bison libkrb5-dev
git clone --branch v${{ env.PG_TLE_BUILD_VERSION }} --depth 1 https://github.com/aws/pg_tle.git /tmp/pg_tle
git clone --branch v${{ env.PGTLE_VERSION }} --depth 1 https://github.com/aws/pg_tle.git /tmp/pg_tle
make -C /tmp/pg_tle install
- name: Enable pg_tle and restart PostgreSQL ${{ matrix.pg }}
run: |
Expand Down Expand Up @@ -838,7 +826,7 @@ jobs:
runs-on: ubuntu-latest
container: pgxn/pgxn-tools
env:
PG_TLE_BUILD_VERSION: "1.5.2"
PGTLE_VERSION: "1.5.2"
steps:
- name: Start PostgreSQL ${{ matrix.pg }}
run: pg-start ${{ matrix.pg }}
Expand All @@ -854,10 +842,10 @@ jobs:
run: bin/assert_fs_clean verify ${{ matrix.pg }} /tmp/pre_pgtap_baseline.txt pgtap.control
- name: Snapshot filesystem extension control files (pre-pg_tle baseline)
run: bin/assert_fs_clean snapshot ${{ matrix.pg }} /tmp/control_baseline.txt
- name: Build and install pg_tle ${{ env.PG_TLE_BUILD_VERSION }}
- name: Build and install pg_tle ${{ env.PGTLE_VERSION }}
run: |
apt-get install -y flex bison libkrb5-dev
git clone --branch v${{ env.PG_TLE_BUILD_VERSION }} --depth 1 https://github.com/aws/pg_tle.git /tmp/pg_tle
git clone --branch v${{ env.PGTLE_VERSION }} --depth 1 https://github.com/aws/pg_tle.git /tmp/pg_tle
make -C /tmp/pg_tle install
- name: Enable pg_tle and restart PostgreSQL ${{ matrix.pg }}
run: |
Expand Down
Loading