Skip to content

Commit 351819f

Browse files
committed
Merge branch 'develop' of github.com:supabase/postgres into INDATA-152
* 'develop' of github.com:supabase/postgres: (29 commits) refactor(ansible): bring our ansible up to modern ansible-lint standards (#1818) fix: update Dockerfiles for changes to postgis multiversion (#1817) refactor(ansible): bring our ansible up to modern ansible-lint standards (#1813) feat: support multiple versions of the postgis extension (#1667) Update pgsql-http to handle semver (#1816) feat: add retry policy for auth service routes (#1782) refactor(ansible): bring our ansible up to modern ansible-lint standards (#1811) fix: move tmpdir for SAA to one that always exists (#1799) refactor(ansible): bring our ansible up to modern ansible-lint standards (#1810) refactor(ansible): bring our ansible up to modern ansible-lint standards (#1809) refactor(ansible): bring our ansible up to modern ansible-lint standards (#1807) build: automatically cancel old tests/build on new push (#1808) refactor(ansible): bring our ansible up to modern ansible-lint standards (#1804) docs: small adjust (#1806) docs: getting started guide in README (#1805) fix: templating of SAA service file fix: adjust the qemu vars filename refactor(ansible): bring our ansible up to modern ansible-lint standards feat: support multiple versions of the http extension (#1664) feat: supply a slightly different supabase-admin-agent configuration for qemu artifacts ...
2 parents 7876920 + 4d7f384 commit 351819f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+2879
-717
lines changed

.github/workflows/ami-release-nix.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ permissions:
1717

1818
jobs:
1919
prepare:
20-
runs-on: large-linux-x86
20+
runs-on: blacksmith-4vcpu-ubuntu-2404
2121
outputs:
2222
postgres_versions: ${{ steps.set-versions.outputs.postgres_versions }}
2323
steps:
@@ -44,7 +44,7 @@ jobs:
4444
matrix:
4545
postgres_version: ${{ fromJson(needs.prepare.outputs.postgres_versions) }}
4646
include:
47-
- runner: large-linux-arm
47+
- runner: blacksmith-2vcpu-ubuntu-2404-arm
4848
runs-on: ${{ matrix.runner }}
4949
timeout-minutes: 150
5050

.github/workflows/check-shellscripts.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ on:
77
pull_request:
88
workflow_dispatch:
99

10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
12+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
13+
1014
permissions:
1115
contents: read
1216

.github/workflows/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
permissions:
77
contents: read
88

9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
11+
cancel-in-progress: true
12+
913
jobs:
1014
check-release-version:
1115
timeout-minutes: 5

.github/workflows/dockerhub-release-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ permissions:
1616

1717
jobs:
1818
prepare:
19-
runs-on: large-linux-x86
19+
runs-on: blacksmith-4vcpu-ubuntu-2404
2020
outputs:
2121
matrix_config: ${{ steps.set-matrix.outputs.matrix_config }}
2222
steps:

.github/workflows/manual-docker-release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ permissions:
1313

1414
jobs:
1515
prepare:
16-
runs-on: large-linux-x86
16+
runs-on: blacksmith-8vcpu-ubuntu-2404
1717
outputs:
1818
matrix_config: ${{ steps.set-matrix.outputs.matrix_config }}
1919
steps:
@@ -46,7 +46,7 @@ jobs:
4646
needs: prepare
4747
strategy:
4848
matrix: ${{ fromJson(needs.prepare.outputs.matrix_config) }}
49-
runs-on: large-linux-x86
49+
runs-on: blacksmith-8vcpu-ubuntu-2404
5050
outputs:
5151
build_args: ${{ steps.args.outputs.result }}
5252
steps:
@@ -72,7 +72,7 @@ jobs:
7272
matrix:
7373
postgres: ${{ fromJson(needs.prepare.outputs.matrix_config).include }}
7474
arch: [amd64, arm64]
75-
runs-on: ${{ matrix.arch == 'amd64' && 'large-linux-x86' || 'large-linux-arm' }}
75+
runs-on: ${{ matrix.arch == 'amd64' && 'blacksmith-8vcpu-ubuntu-2404' || 'large-linux-arm' }}
7676
timeout-minutes: 180
7777
steps:
7878
- name: Checkout Repo
@@ -141,7 +141,7 @@ jobs:
141141
strategy:
142142
matrix:
143143
include: ${{ fromJson(needs.prepare.outputs.matrix_config).include }}
144-
runs-on: large-linux-x86
144+
runs-on: blacksmith-8vcpu-ubuntu-2404
145145
steps:
146146
- name: Checkout Repo
147147
uses: supabase/postgres/.github/actions/shared-checkout@HEAD
@@ -185,7 +185,7 @@ jobs:
185185
${{ steps.get_version.outputs.pg_version }}_arm64
186186
combine_results:
187187
needs: [prepare, merge_manifest]
188-
runs-on: large-linux-x86
188+
runs-on: blacksmith-8vcpu-ubuntu-2404
189189
steps:
190190
- name: Checkout Repo
191191
uses: supabase/postgres/.github/actions/shared-checkout@HEAD

.github/workflows/nix-build.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,19 @@ permissions:
1414
contents: write
1515
packages: write
1616

17+
concurrency:
18+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
19+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
20+
1721
jobs:
1822
build-run-image:
1923
strategy:
2024
fail-fast: false
2125
matrix:
2226
include:
23-
- runner: large-linux-x86
27+
- runner: blacksmith-32vcpu-ubuntu-2404
2428
arch: amd64
25-
- runner: large-linux-arm
29+
- runner: blacksmith-32vcpu-ubuntu-2404-arm
2630
arch: arm64
2731
- runner: macos-latest-xlarge
2832
arch: arm64

.github/workflows/publish-migrations-prod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55

66
jobs:
77
build:
8-
runs-on: large-linux-arm
8+
runs-on: blacksmith-2vcpu-ubuntu-2404-arm
99
timeout-minutes: 15
1010
permissions:
1111
id-token: write

.github/workflows/publish-migrations-staging.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
build:
11-
runs-on: large-linux-arm
11+
runs-on: blacksmith-2vcpu-ubuntu-2404-arm
1212
timeout-minutes: 15
1313
permissions:
1414
id-token: write

.github/workflows/publish-nix-pgupgrade-bin-flake-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ permissions:
1212

1313
jobs:
1414
prepare:
15-
runs-on: large-linux-x86
15+
runs-on: blacksmith-2vcpu-ubuntu-2404
1616
outputs:
1717
postgres_versions: ${{ steps.set-versions.outputs.postgres_versions }}
1818
steps:

.github/workflows/publish-nix-pgupgrade-scripts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ permissions:
1919

2020
jobs:
2121
prepare:
22-
runs-on: large-linux-x86
22+
runs-on: blacksmith-2vcpu-ubuntu-2404
2323
outputs:
2424
postgres_versions: ${{ steps.set-versions.outputs.postgres_versions }}
2525
steps:

0 commit comments

Comments
 (0)