Skip to content

Commit

Permalink
Enable building on PG17 (#798)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jasonmp85
jasonmp85 authored Nov 11, 2024
1 parent 065807f commit 2601a5b
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 56 deletions.
117 changes: 62 additions & 55 deletions .github/workflows/builder-images.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,15 @@ jobs:
- "14"
- "15"
- "16"
- "17"
steps:
- name: Check out the repo
uses: actions/checkout@v4
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to Quay.io
Expand Down Expand Up @@ -68,6 +74,11 @@ jobs:
steps:
- name: Check out the repo
uses: actions/checkout@v4
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to Quay.io
Expand Down Expand Up @@ -120,17 +131,6 @@ jobs:
- "15"
- "16"
pgrx_version:
- "0.7.4"
- "0.8.0"
- "0.8.3"
- "0.8.4"
- "0.9.0"
- "0.9.1"
- "0.9.7"
- "0.9.8"
- "0.10.0"
- "0.10.1"
- "0.10.2"
- "0.11.0"
- "0.11.1"
- "0.11.2"
Expand All @@ -145,25 +145,34 @@ jobs:
- "0.12.6"
- "0.12.7"
exclude:
- pg_version: "16"
pgrx_version: "0.7.4"
- pg_version: "16"
pgrx_version: "0.8.0"
- pg_version: "16"
pgrx_version: "0.8.3"
- pg_version: "16"
pgrx_version: "0.8.4"
- pg_version: "16"
pgrx_version: "0.9.0"
- pg_version: "16"
pgrx_version: "0.9.1"
- pg_version: "16"
pgrx_version: "0.9.7"
- pg_version: "16"
pgrx_version: "0.9.8"
- pg_version: "17"
pgrx_version: "0.11.0"
- pg_version: "17"
pgrx_version: "0.11.1"
- pg_version: "17"
pgrx_version: "0.11.2"
- pg_version: "17"
pgrx_version: "0.11.3"
- pg_version: "17"
pgrx_version: "0.11.4"
- pg_version: "17"
pgrx_version: "0.12.0"
- pg_version: "17"
pgrx_version: "0.12.1"
- pg_version: "17"
pgrx_version: "0.12.2"
- pg_version: "17"
pgrx_version: "0.12.3"
- pg_version: "17"
pgrx_version: "0.12.4"
steps:
- name: Check out the repo
uses: actions/checkout@v4
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to Quay.io
Expand All @@ -189,7 +198,7 @@ jobs:
create_and_push_pgrx_manifests:
name: Build and push PGRX manifests
needs:
needs:
- build_and_push_pgrx_builders
runs-on:
- self-hosted
Expand All @@ -203,17 +212,6 @@ jobs:
- "15"
- "16"
pgrx_version:
- "0.7.4"
- "0.8.0"
- "0.8.3"
- "0.8.4"
- "0.9.0"
- "0.9.1"
- "0.9.7"
- "0.9.8"
- "0.10.0"
- "0.10.1"
- "0.10.2"
- "0.11.0"
- "0.11.1"
- "0.11.2"
Expand All @@ -228,25 +226,34 @@ jobs:
- "0.12.6"
- "0.12.7"
exclude:
- pg_version: "16"
pgrx_version: "0.7.4"
- pg_version: "16"
pgrx_version: "0.8.0"
- pg_version: "16"
pgrx_version: "0.8.3"
- pg_version: "16"
pgrx_version: "0.8.4"
- pg_version: "16"
pgrx_version: "0.9.0"
- pg_version: "16"
pgrx_version: "0.9.1"
- pg_version: "16"
pgrx_version: "0.9.7"
- pg_version: "16"
pgrx_version: "0.9.8"
- pg_version: "17"
pgrx_version: "0.11.0"
- pg_version: "17"
pgrx_version: "0.11.1"
- pg_version: "17"
pgrx_version: "0.11.2"
- pg_version: "17"
pgrx_version: "0.11.3"
- pg_version: "17"
pgrx_version: "0.11.4"
- pg_version: "17"
pgrx_version: "0.12.0"
- pg_version: "17"
pgrx_version: "0.12.1"
- pg_version: "17"
pgrx_version: "0.12.2"
- pg_version: "17"
pgrx_version: "0.12.3"
- pg_version: "17"
pgrx_version: "0.12.4"
steps:
- name: Check out the repo
uses: actions/checkout@v4
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to Quay.io
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/extensions.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@ jobs:
- name: Build extension for Postgres 16
run: cd ${{ matrix.path }} && trunk build --pg-version 16
continue-on-error: true
- name: Build extension for Postgres 17
run: cd ${{ matrix.path }} && trunk build --pg-version 17
continue-on-error: true
- name: Handle shared_preload_libraries
shell: bash -e {0}
run: |
Expand Down
2 changes: 1 addition & 1 deletion cli/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pg-trunk"
version = "0.12.31"
version = "0.13.0"
edition = "2021"
authors = ["Ian Stanton", "Vinícius Miguel"]
description = "A package manager for PostgreSQL extensions"
Expand Down
2 changes: 2 additions & 0 deletions cli/src/commands/install.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@ impl PgConfig {
15
} else if version.starts_with("PostgreSQL 16") {
16
} else if version.starts_with("PostgreSQL 17") {
17
} else {
bail!("Currently unsupported Postgres version: {version}")
};
Expand Down
2 changes: 2 additions & 0 deletions cli/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ pub fn pg_version_to_str(pg_version: u8) -> &'static str {
14 => "14",
15 => "15",
16 => "16",
17 => "17",
_ => panic!("Unsupported Postgres version!"),
}
}
Expand All @@ -110,6 +111,7 @@ pub fn pg_release_for_version(pg_version: u8) -> &'static str {
14 => "REL_14_10",
15 => "REL_15_3",
16 => "REL_16_1",
17 => "REL_17_0",
_ => panic!("Unsupported Postgres version!"),
}
}

0 comments on commit 2601a5b

Please sign in to comment.