Skip to content

Commit

Permalink
Manually specify extensions to build (#890)
Browse files Browse the repository at this point in the history
Force the extensions workflow to build the extensions known to have
`directory` fields in their control files, so as to fix them. Upgrade
to `trunk-test-tembo:8a3bd64-pg15` to get the fixes, made in c3154c
(#888) and f68df13 (#891), and released in 8a3bd64 (#892).
  • Loading branch information
theory committed Jan 8, 2025
1 parent 8a3bd64 commit 553c088
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 6 deletions.
24 changes: 20 additions & 4 deletions .github/workflows/extensions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,22 @@ jobs:
- dind
- xlarge-16x16
container:
image: quay.io/tembo/trunk-test-tembo:1d073a4-pg15
image: quay.io/tembo/trunk-test-tembo:8a3bd64-pg15
options: --user root
needs:
- find_directories
strategy:
fail-fast: false
matrix:
ext: ${{ fromJson(needs.find_directories.outputs.directories).include }}
# ext: ${{ fromJson(needs.find_directories.outputs.directories).include }}
ext:
- { name: pgfincore, path: "./contrib/pgfincore" }
- { name: pgtelemetry, path: "./contrib/pgtelemetry" }
- { name: pljava, path: "./contrib/pljava" }
- { name: postgresql_anonymizer, path: "./contrib/postgresql_anonymizer" }
- { name: emaj, path: "./contrib/emaj" }
- { name: pg_semver, path: "./contrib/pg_semver" }
- { name: rdkit, path: "./contrib/rdkit" }
pg: [15]
exclude:
# pg_hint_plan has separate extensions for each major version
Expand Down Expand Up @@ -92,14 +100,22 @@ jobs:
- dind
- xlarge-16x16
container:
image: quay.io/tembo/trunk-test-tembo:1d073a4-pg15
image: quay.io/tembo/trunk-test-tembo:8a3bd64-pg15
options: --user root
needs:
- find_directories
strategy:
fail-fast: false
matrix:
ext: ${{ fromJson(needs.find_directories.outputs.directories).include }}
# ext: ${{ fromJson(needs.find_directories.outputs.directories).include }}
ext:
- { name: pgfincore, path: "./contrib/pgfincore" }
- { name: pgtelemetry, path: "./contrib/pgtelemetry" }
- { name: pljava, path: "./contrib/pljava" }
- { name: postgresql_anonymizer, path: "./contrib/postgresql_anonymizer" }
- { name: emaj, path: "./contrib/emaj" }
- { name: pg_semver, path: "./contrib/pg_semver" }
- { name: rdkit, path: "./contrib/rdkit" }
pg: [17, 16, 15, 14]
exclude:
- { pg: 14, ext: { name: pg_walinspect } } # Added in Postgres 17
Expand Down
4 changes: 2 additions & 2 deletions contrib/mobilitydb/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG PG_VERSION
# Set up iamge to copy trunk from.
FROM quay.io/tembo/trunk-test-tembo:1d073a4-pg15 AS trunk
# Set up image to copy trunk from.
FROM quay.io/tembo/trunk-test-tembo:8a3bd64-pg15 AS trunk
FROM quay.io/coredb/c-builder:pg${PG_VERSION}

USER root
Expand Down

0 comments on commit 553c088

Please sign in to comment.