From e81258d9666a1f607c3b8fc261922aec9048d967 Mon Sep 17 00:00:00 2001 From: jnasbyupgrade Date: Fri, 24 Jul 2026 17:39:41 -0500 Subject: [PATCH 1/2] Remove dead Travis CI files and vestigial .template .travis.yml and pg-travis-test.sh are the old Travis CI setup, fully superseded by .github/workflows/ci.yml - nothing references either of them anymore. .template just contains the literal word "sql", added in the project's very first commit (2015) and never read by any pgxntool script since (checked all of pgxntool/*.sh and *.mk) - vestigial scaffolding output from a much older pgxntool version. --- .template | 1 - .travis.yml | 10 ---------- pg-travis-test.sh | 29 ----------------------------- 3 files changed, 40 deletions(-) delete mode 100644 .template delete mode 100644 .travis.yml delete mode 100644 pg-travis-test.sh diff --git a/.template b/.template deleted file mode 100644 index d5ce2f2..0000000 --- a/.template +++ /dev/null @@ -1 +0,0 @@ -sql diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 96853dc..0000000 --- a/.travis.yml +++ /dev/null @@ -1,10 +0,0 @@ -language: c -before_install: - - wget https://gist.github.com/petere/5893799/raw/apt.postgresql.org.sh - - sudo sh ./apt.postgresql.org.sh - - sudo sh -c "echo deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs 2>/dev/null)-pgdg main $PGVERSION >> /etc/apt/sources.list.d/pgdg.list" -env: - - PGVERSION=9.6 - - PGVERSION=9.5 - - PGVERSION=9.4 -script: bash ./pg-travis-test.sh diff --git a/pg-travis-test.sh b/pg-travis-test.sh deleted file mode 100644 index 6b9964b..0000000 --- a/pg-travis-test.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -# Based on https://gist.github.com/petere/6023944 - -set -eux - -sudo apt-get update - -packages="python-setuptools postgresql-$PGVERSION postgresql-server-dev-$PGVERSION postgresql-common" - -# bug: http://www.postgresql.org/message-id/20130508192711.GA9243@msgid.df7cb.de -sudo update-alternatives --remove-all postmaster.1.gz - -# stop all existing instances (because of https://github.com/travis-ci/travis-cookbooks/pull/221) -sudo service postgresql stop -# and make sure they don't come back -echo 'exit 0' | sudo tee /etc/init.d/postgresql -sudo chmod a+x /etc/init.d/postgresql - -sudo apt-get -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install $packages - -sudo easy_install pgxnclient - -PGPORT=55435 -sudo pg_createcluster --start $PGVERSION test -p $PGPORT -- -A trust -# TODO: have base.mk support dynamic sudo -sudo PGPORT=$PGPORT PGUSER=postgres PG_CONFIG=/usr/lib/postgresql/$PGVERSION/bin/pg_config make test - -[ ! -e test/regression.diffs ] From 60f6a049f44d1abe9620bf1045dde56a0e4c97db Mon Sep 17 00:00:00 2001 From: jnasbyupgrade Date: Sat, 25 Jul 2026 17:11:27 -0500 Subject: [PATCH 2/2] CI: stop double-running on every PR commit on: [push, pull_request] fires CI twice for the same commit on any PR whose head branch lives in this repo (not a fork) - once for the push event, once for the pull_request event - which is what let one flaky run show red next to an identical green run on PR #14. Restrict the push trigger to master (matching cat_tools' own ci.yml); pull_request still covers every PR regardless of where its branch lives. --- .github/workflows/ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d4aaec9..23bacab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,5 +1,9 @@ name: CI -on: [push, pull_request] +on: + push: + branches: + - master + pull_request: jobs: test: strategy: