Skip to content

Commit dcf72de

Browse files
7ttp7ttp
authored
Merge branch 'develop' into fix/ltree-extension-search-path
2 parents 9815fdb + 072abe8 commit dcf72de

File tree

13 files changed

+268
-144
lines changed

13 files changed

+268
-144
lines changed

‎.github/dependabot.yml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@ updates:
66
interval: "cron"
77
cronjob: "0 0 * * *"
88
groups:
9-
action-minor:
10-
update-types:
11-
- minor
12-
- patch
9+
actions-major:
10+
patterns:
11+
- "*"
1312
- package-ecosystem: "gomod"
1413
directories:
1514
- "/"
@@ -28,10 +27,9 @@ updates:
2827
interval: "cron"
2928
cronjob: "0 0 * * *"
3029
groups:
31-
npm-minor:
32-
update-types:
33-
- minor
34-
- patch
30+
npm-major:
31+
patterns:
32+
- "*"
3533
- package-ecosystem: "docker"
3634
directory: "pkg/config/templates"
3735
schedule:

‎.github/workflows/api-sync.yml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ name: API Sync
22

33
on:
44
repository_dispatch:
5-
types: [api-sync]
5+
types:
6+
- api-sync
67
workflow_dispatch: # allow manual triggering
78

89
# Add explicit permissions
@@ -57,12 +58,15 @@ jobs:
5758
Changes were detected in the generated API code after syncing with the latest spec from infrastructure.
5859
branch: sync/api-types
5960
base: develop
60-
labels: |
61-
automated pr
62-
api-sync
61+
62+
- name: Approve a PR
63+
if: steps.check.outputs.has_changes == 'true'
64+
run: gh pr review --approve "${{ steps.cpr.outputs.pull-request-number }}"
65+
env:
66+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6367

6468
- name: Enable Pull Request Automerge
6569
if: steps.check.outputs.has_changes == 'true'
6670
run: gh pr merge --auto --squash "${{ steps.cpr.outputs.pull-request-number }}"
6771
env:
68-
GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
72+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/automerge.yml‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,17 @@ jobs:
2222
with:
2323
github-token: "${{ secrets.GITHUB_TOKEN }}"
2424

25-
- name: Generate token
26-
id: app-token
27-
uses: actions/create-github-app-token@v2
28-
with:
29-
app-id: ${{ secrets.APP_ID }}
30-
private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
31-
3225
# Here the PR gets approved.
3326
- name: Approve a PR
3427
if: ${{ steps.meta.outputs.update-type == 'version-update:semver-patch' || (!startsWith(steps.meta.outputs.previous-version, '0.') && steps.meta.outputs.update-type == 'version-update:semver-minor') }}
3528
run: gh pr review --approve "${{ github.event.pull_request.html_url }}"
3629
env:
37-
GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
30+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3831

3932
# Finally, this sets the PR to allow auto-merging for patch and minor
4033
# updates if all checks pass
4134
- name: Enable auto-merge for Dependabot PRs
4235
if: ${{ steps.meta.outputs.update-type == 'version-update:semver-patch' || (!startsWith(steps.meta.outputs.previous-version, '0.') && steps.meta.outputs.update-type == 'version-update:semver-minor') }}
4336
run: gh pr merge --auto --squash "${{ github.event.pull_request.html_url }}"
4437
env:
45-
GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
38+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/mirror-image.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
name: Mirror Image
22

33
on:
4+
repository_dispatch:
5+
types:
6+
- mirror-image
47
workflow_call:
58
inputs:
69
image:
@@ -15,18 +18,16 @@ on:
1518

1619
permissions:
1720
contents: read
21+
packages: write
22+
id-token: write
1823

1924
jobs:
2025
mirror:
2126
runs-on: ubuntu-latest
22-
permissions:
23-
contents: read
24-
packages: write
25-
id-token: write
2627
steps:
2728
- id: strip
2829
run: |
29-
TAG=${{ inputs.image }}
30+
TAG=${{ github.event.client_payload.image || inputs.image }}
3031
echo "image=${TAG##*/}" >> $GITHUB_OUTPUT
3132
- name: configure aws credentials
3233
uses: aws-actions/[email protected]
@@ -43,7 +44,7 @@ jobs:
4344
password: ${{ secrets.GITHUB_TOKEN }}
4445
- uses: akhilerm/[email protected]
4546
with:
46-
src: docker.io/${{ inputs.image }}
47+
src: docker.io/${{ github.event.client_payload.image || inputs.image }}
4748
dst: |
4849
public.ecr.aws/supabase/${{ steps.strip.outputs.image }}
4950
ghcr.io/supabase/${{ steps.strip.outputs.image }}

‎.github/workflows/mirror.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ on:
1414
# mirrored yet. It's a catch-22!
1515
#
1616
# TODO: Make the cli start test run *after* we mirror images (if needed).
17-
pull_request_review:
18-
types:
19-
- submitted
2017
workflow_dispatch:
2118

2219
permissions:
@@ -25,7 +22,6 @@ permissions:
2522
jobs:
2623
setup:
2724
runs-on: ubuntu-latest
28-
if: ${{ github.event_name == 'workflow_dispatch' || github.event.review.state == 'approved' }}
2925
outputs:
3026
tags: ${{ steps.list.outputs.tags }}
3127
curr: ${{ steps.curr.outputs.tags }}

‎.github/workflows/release-beta.yml‎

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
name: Release (Beta)
22

33
on:
4-
pull_request_review:
5-
types:
6-
- submitted
74
push:
85
branches:
96
- develop
@@ -13,66 +10,8 @@ permissions:
1310
contents: read
1411

1512
jobs:
16-
approved:
17-
name: fast-forward
18-
if: |
19-
github.event.pull_request.head.ref == 'develop' &&
20-
github.event.pull_request.base.ref == 'main' &&
21-
github.event.review.state == 'approved'
22-
runs-on: ubuntu-latest
23-
permissions:
24-
contents: write
25-
packages: write
26-
outputs:
27-
release_tag: ${{ steps.latest-release.outputs.tagName }}
28-
steps:
29-
- uses: actions/checkout@v6
30-
with:
31-
fetch-depth: 0
32-
- run: |
33-
git checkout main
34-
git merge --ff-only "${{ github.event.pull_request.head.sha }}"
35-
git push origin main
36-
- id: latest-release
37-
run: |
38-
latest=$(gh release list --limit 1 --json tagName --jq '.[].tagName')
39-
gh release edit $latest --latest --prerelease=false
40-
echo "tagName=$latest" >> $GITHUB_OUTPUT
41-
env:
42-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
43-
44-
tag:
45-
name: Move latest tag
46-
needs:
47-
- approved
48-
runs-on: ubuntu-latest
49-
permissions:
50-
contents: read
51-
# Required for npm OIDC
52-
id-token: write
53-
steps:
54-
- uses: actions/checkout@v6
55-
- uses: actions/setup-node@v6
56-
with:
57-
node-version: latest
58-
registry-url: https://registry.npmjs.org
59-
- run: npm dist-tag add "supabase@${RELEASE_TAG#v}" latest
60-
env:
61-
RELEASE_TAG: ${{ needs.approved.outputs.release_tag }}
62-
63-
deploy:
64-
needs:
65-
- approved
66-
- tag
67-
# Call workflow explicitly because events from actions cannot trigger more actions
68-
uses: ./.github/workflows/release.yml
69-
with:
70-
release: ${{ needs.approved.outputs.release_tag }}
71-
secrets: inherit
72-
7313
release:
7414
name: semantic-release
75-
if: ${{ github.event_name != 'pull_request_review' }}
7615
runs-on: ubuntu-latest
7716
permissions:
7817
contents: write

‎.github/workflows/release.yml‎

Lines changed: 39 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,45 @@
11
name: Release
22

33
on:
4-
workflow_call:
5-
inputs:
6-
release:
7-
required: true
8-
type: string
9-
workflow_dispatch:
10-
inputs:
11-
release:
12-
description: "v1.0.0"
13-
required: true
14-
type: string
4+
pull_request_review:
5+
types:
6+
- submitted
157

168
permissions:
179
contents: read
1810

1911
jobs:
12+
fast-forward:
13+
if: |
14+
github.event.pull_request.head.ref == 'develop' &&
15+
github.event.pull_request.base.ref == 'main' &&
16+
github.event.review.state == 'approved'
17+
runs-on: ubuntu-latest
18+
permissions:
19+
contents: write
20+
packages: write
21+
outputs:
22+
release_tag: ${{ steps.latest-release.outputs.tagName }}
23+
steps:
24+
- uses: actions/checkout@v6
25+
with:
26+
fetch-depth: 0
27+
- run: |
28+
git checkout main
29+
git merge --ff-only "${{ github.event.pull_request.head.sha }}"
30+
git push origin main
31+
- id: latest-release
32+
run: |
33+
latest=$(gh release list --limit 1 --json tagName --jq '.[].tagName')
34+
gh release edit $latest --latest --prerelease=false
35+
echo "tagName=$latest" >> $GITHUB_OUTPUT
36+
env:
37+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
38+
2039
commit:
2140
name: Publish Brew and Scoop
41+
needs:
42+
- fast-forward
2243
runs-on: ubuntu-latest
2344
steps:
2445
- uses: actions/checkout@v6
@@ -35,12 +56,14 @@ jobs:
3556
repositories: |
3657
homebrew-tap
3758
scoop-bucket
38-
- run: go run tools/publish/main.go ${{ inputs.release }}
59+
- run: go run tools/publish/main.go ${{ needs.fast-forward.outputs.release_tag }}
3960
env:
4061
GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
4162

4263
compose:
4364
name: Bump self-hosted versions
65+
needs:
66+
- fast-forward
4467
runs-on: ubuntu-latest
4568
steps:
4669
- uses: actions/checkout@v6
@@ -63,6 +86,7 @@ jobs:
6386
changelog:
6487
name: Publish changelog
6588
needs:
89+
- fast-forward
6690
- commit
6791
runs-on: ubuntu-latest
6892
steps:
@@ -86,6 +110,8 @@ jobs:
86110

87111
docs:
88112
name: Publish reference docs
113+
needs:
114+
- fast-forward
89115
runs-on: ubuntu-latest
90116
steps:
91117
- uses: actions/checkout@v6
@@ -101,6 +127,6 @@ jobs:
101127
owner: ${{ github.repository_owner }}
102128
repositories: |
103129
supabase
104-
- run: go run docs/main.go ${{ inputs.release }} | go run tools/bumpdoc/main.go apps/docs/spec/cli_v1_commands.yaml
130+
- run: go run docs/main.go ${{ needs.fast-forward.outputs.release_tag }} | go run tools/bumpdoc/main.go apps/docs/spec/cli_v1_commands.yaml
105131
env:
106132
GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}

‎.github/workflows/tag-npm.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Tag NPM
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
release:
7+
required: true
8+
type: string
9+
workflow_dispatch:
10+
inputs:
11+
release:
12+
description: "v1.0.0"
13+
required: true
14+
type: string
15+
16+
permissions:
17+
contents: read
18+
id-token: write
19+
20+
jobs:
21+
tag:
22+
name: Move latest tag
23+
runs-on: ubuntu-latest
24+
steps:
25+
- uses: actions/checkout@v6
26+
27+
- uses: actions/setup-node@v6
28+
with:
29+
node-version: latest
30+
registry-url: https://registry.npmjs.org
31+
32+
- run: npm dist-tag add "supabase@${RELEASE_TAG#v}" latest
33+
env:
34+
RELEASE_TAG: ${{ inputs.release }}
35+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

‎go.mod‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ require (
3939
github.com/mithrandie/csvq-driver v1.7.0
4040
github.com/muesli/reflow v0.3.0
4141
github.com/oapi-codegen/nullable v1.1.0
42+
github.com/olekukonko/tablewriter v1.1.0
4243
github.com/slack-go/slack v0.17.3
4344
github.com/spf13/afero v1.15.0
4445
github.com/spf13/cobra v1.10.1
@@ -315,7 +316,8 @@ require (
315316
github.com/oapi-codegen/runtime v1.1.2 // indirect
316317
github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 // indirect
317318
github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect
318-
github.com/olekukonko/tablewriter v0.0.5 // indirect
319+
github.com/olekukonko/errors v1.1.0 // indirect
320+
github.com/olekukonko/ll v0.0.9 // indirect
319321
github.com/opencontainers/go-digest v1.0.0 // indirect
320322
github.com/opencontainers/image-spec v1.1.1 // indirect
321323
github.com/pelletier/go-toml v1.9.5 // indirect

‎go.sum‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,6 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE
719719
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
720720
github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
721721
github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
722-
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
723722
github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
724723
github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
725724
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
@@ -829,8 +828,12 @@ github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 h1:G7ERwszslrBzRxj//J
829828
github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037/go.mod h1:2bpvgLBZEtENV5scfDFEtB/5+1M4hkQhDQrccEJ/qGw=
830829
github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 h1:bQx3WeLcUWy+RletIKwUIt4x3t8n2SxavmoclizMb8c=
831830
github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90/go.mod h1:y5+oSEHCPT/DGrS++Wc/479ERge0zTFxaF8PbGKcg2o=
832-
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
833-
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
831+
github.com/olekukonko/errors v1.1.0 h1:RNuGIh15QdDenh+hNvKrJkmxxjV4hcS50Db478Ou5sM=
832+
github.com/olekukonko/errors v1.1.0/go.mod h1:ppzxA5jBKcO1vIpCXQ9ZqgDh8iwODz6OXIGKU8r5m4Y=
833+
github.com/olekukonko/ll v0.0.9 h1:Y+1YqDfVkqMWuEQMclsF9HUR5+a82+dxJuL1HHSRpxI=
834+
github.com/olekukonko/ll v0.0.9/go.mod h1:En+sEW0JNETl26+K8eZ6/W4UQ7CYSrrgg/EdIYT2H8g=
835+
github.com/olekukonko/tablewriter v1.1.0 h1:N0LHrshF4T39KvI96fn6GT8HEjXRXYNDrDjKFDB7RIY=
836+
github.com/olekukonko/tablewriter v1.1.0/go.mod h1:5c+EBPeSqvXnLLgkm9isDdzR3wjfBkHR9Nhfp3NWrzo=
834837
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
835838
github.com/onsi/ginkgo v1.10.2/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
836839
github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=

0 commit comments

Comments
 (0)