Skip to content

Commit 8cc481e

Browse files
authored
Merge branch 'develop' into fix/ltree-extension-search-path
2 parents 662b181 + dde2afb commit 8cc481e

File tree

7 files changed

+69
-20
lines changed

7 files changed

+69
-20
lines changed

.github/workflows/api-sync.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,19 @@ jobs:
3636
echo "has_changes=true" >> $GITHUB_OUTPUT
3737
fi
3838
39+
- name: Generate token
40+
id: app-token
41+
uses: actions/create-github-app-token@v2
42+
with:
43+
app-id: ${{ secrets.APP_ID }}
44+
private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
45+
3946
- name: Create Pull Request
4047
if: steps.check.outputs.has_changes == 'true'
4148
id: cpr
4249
uses: peter-evans/create-pull-request@v7
4350
with:
44-
token: ${{ secrets.GH_PAT }}
51+
token: ${{ steps.app-token.outputs.token }}
4552
commit-message: "chore: sync API types from infrastructure"
4653
title: "chore: sync API types from infrastructure"
4754
body: |
@@ -58,4 +65,4 @@ jobs:
5865
if: steps.check.outputs.has_changes == 'true'
5966
run: gh pr merge --auto --squash "${{ steps.cpr.outputs.pull-request-number }}"
6067
env:
61-
GH_TOKEN: ${{ secrets.GH_PAT }}
68+
GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}

.github/workflows/automerge.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,24 @@ 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+
2532
# Here the PR gets approved.
2633
- name: Approve a PR
2734
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') }}
2835
run: gh pr review --approve "${{ github.event.pull_request.html_url }}"
2936
env:
30-
GITHUB_TOKEN: ${{ secrets.GH_PAT }}
37+
GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
3138

3239
# Finally, this sets the PR to allow auto-merging for patch and minor
3340
# updates if all checks pass
3441
- name: Enable auto-merge for Dependabot PRs
3542
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') }}
3643
run: gh pr merge --auto --squash "${{ github.event.pull_request.html_url }}"
3744
env:
38-
GITHUB_TOKEN: ${{ secrets.GH_PAT }}
45+
GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}

.github/workflows/release-beta.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,21 @@ jobs:
7070
with:
7171
go-version-file: go.mod
7272
cache: true
73+
# use GitHub app to create a release token that can publish to homebrew-tap and scoop
74+
- name: Generate token
75+
id: app-token
76+
uses: actions/create-github-app-token@v2
77+
with:
78+
app-id: ${{ secrets.APP_ID }}
79+
private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
80+
owner: ${{ github.repository_owner }}
81+
repositories: |
82+
cli
83+
homebrew-tap
84+
scoop-bucket
7385
- run: go run tools/publish/main.go --beta "${{ needs.release.outputs.new-release-version }}"
7486
env:
75-
GITHUB_TOKEN: ${{ secrets.GH_PAT }}
87+
GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
7688

7789
publish:
7890
name: Publish NPM
@@ -85,9 +97,7 @@ jobs:
8597
- uses: actions/checkout@v6
8698
- uses: actions/setup-node@v6
8799
with:
88-
node-version: "16.x"
89-
registry-url: "https://registry.npmjs.org"
100+
node-version: latest
101+
registry-url: https://registry.npmjs.org
90102
- run: npm --git-tag-version=false version ${{ needs.release.outputs.new-release-version }}
91103
- run: npm publish --tag ${{ needs.release.outputs.new-release-channel }}
92-
env:
93-
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/release.yml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,25 @@ jobs:
1717
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1818
outputs:
1919
release_tag: ${{ steps.prerelease.outputs.tagName }}
20+
app_token: ${{ steps.app-token.outputs.token }}
2021
steps:
2122
- uses: actions/checkout@v6
2223
- id: prerelease
2324
run: |
2425
gh release list --limit 1 --json tagName --jq \
2526
'.[]|to_entries|map("\(.key)=\(.value|tostring)")|.[]' >> $GITHUB_OUTPUT
2627
- run: gh release edit ${{ steps.prerelease.outputs.tagName }} --latest --prerelease=false
28+
- id: app-token
29+
uses: actions/create-github-app-token@v2
30+
with:
31+
app-id: ${{ secrets.APP_ID }}
32+
private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
33+
owner: ${{ github.repository_owner }}
34+
repositories: |
35+
cli
36+
homebrew-tap
37+
scoop-bucket
38+
supabase
2739
2840
commit:
2941
name: Publish Brew and Scoop
@@ -38,7 +50,7 @@ jobs:
3850
cache: true
3951
- run: go run tools/publish/main.go ${{ needs.settings.outputs.release_tag }}
4052
env:
41-
GITHUB_TOKEN: ${{ secrets.GH_PAT }}
53+
GITHUB_TOKEN: ${{ needs.settings.outputs.app_token }}
4254

4355
publish:
4456
name: Publish NPM
@@ -51,6 +63,8 @@ jobs:
5163

5264
compose:
5365
name: Bump self-hosted versions
66+
needs:
67+
- settings
5468
runs-on: ubuntu-latest
5569
steps:
5670
- uses: actions/checkout@v6
@@ -60,11 +74,12 @@ jobs:
6074
cache: true
6175
- run: go run tools/selfhost/main.go
6276
env:
63-
GITHUB_TOKEN: ${{ secrets.GH_PAT }}
77+
GITHUB_TOKEN: ${{ needs.settings.outputs.app_token }}
6478

6579
changelog:
6680
name: Publish changelog
6781
needs:
82+
- settings
6883
- commit
6984
- publish
7085
runs-on: ubuntu-latest
@@ -76,7 +91,7 @@ jobs:
7691
cache: true
7792
- run: go run tools/changelog/main.go ${{ secrets.SLACK_CHANNEL }}
7893
env:
79-
GITHUB_TOKEN: ${{ secrets.GH_PAT }}
94+
GITHUB_TOKEN: ${{ needs.settings.outputs.app_token }}
8095
SLACK_TOKEN: ${{ secrets.SLACK_TOKEN }}
8196

8297
docs:
@@ -92,4 +107,4 @@ jobs:
92107
cache: true
93108
- run: go run docs/main.go ${{ needs.settings.outputs.release_tag }} | go run tools/bumpdoc/main.go apps/docs/spec/cli_v1_commands.yaml
94109
env:
95-
GITHUB_TOKEN: ${{ secrets.GH_PAT }}
110+
GITHUB_TOKEN: ${{ needs.settings.outputs.app_token }}

.github/workflows/tag-npm.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,20 @@ on:
1515

1616
permissions:
1717
contents: read
18+
id-token: write
1819

1920
jobs:
2021
tag:
2122
name: Move latest tag
2223
runs-on: ubuntu-latest
2324
steps:
2425
- uses: actions/checkout@v6
26+
2527
- uses: actions/setup-node@v6
2628
with:
27-
node-version: "16.x"
28-
registry-url: "https://registry.npmjs.org"
29+
node-version: latest
30+
registry-url: https://registry.npmjs.org
31+
2932
- run: npm dist-tag add "supabase@${RELEASE_TAG#v}" latest
3033
env:
3134
RELEASE_TAG: ${{ inputs.release }}
32-
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

pkg/config/templates/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ FROM library/kong:2.8.1 AS kong
55
FROM axllent/mailpit:v1.22.3 AS mailpit
66
FROM postgrest/postgrest:v13.0.7 AS postgrest
77
FROM supabase/postgres-meta:v0.93.1 AS pgmeta
8-
FROM supabase/studio:2025.11.24-sha-d990ae8 AS studio
8+
FROM supabase/studio:2025.11.25-sha-8de52c4 AS studio
99
FROM darthsim/imgproxy:v3.8.0 AS imgproxy
1010
FROM supabase/edge-runtime:v1.69.25 AS edgeruntime
1111
FROM timberio/vector:0.28.1-alpine AS vector
1212
FROM supabase/supavisor:2.7.4 AS supavisor
1313
FROM supabase/gotrue:v2.183.0 AS gotrue
14-
FROM supabase/realtime:v2.65.2 AS realtime
14+
FROM supabase/realtime:v2.65.3 AS realtime
1515
FROM supabase/storage-api:v1.32.0 AS storage
16-
FROM supabase/logflare:1.26.12 AS logflare
16+
FROM supabase/logflare:1.26.13 AS logflare
1717
# Append to JobImages when adding new dependencies below
1818
FROM supabase/pgadmin-schema-diff:cli-0.0.5 AS differ
1919
FROM supabase/migra:3.0.1663481299 AS migra

pkg/config/updater_test.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,14 +224,22 @@ func TestUpdateStorageConfig(t *testing.T) {
224224
FileSizeLimit: 100,
225225
Features: struct {
226226
IcebergCatalog *struct {
227-
Enabled bool `json:"enabled"`
227+
Enabled bool `json:"enabled"`
228+
MaxCatalogs int `json:"maxCatalogs"`
229+
MaxNamespaces int `json:"maxNamespaces"`
230+
MaxTables int `json:"maxTables"`
228231
} `json:"icebergCatalog,omitempty"`
229232
ImageTransformation struct {
230233
Enabled bool `json:"enabled"`
231234
} `json:"imageTransformation"`
232235
S3Protocol struct {
233236
Enabled bool `json:"enabled"`
234237
} `json:"s3Protocol"`
238+
VectorBuckets *struct {
239+
Enabled bool `json:"enabled"`
240+
MaxBuckets int `json:"maxBuckets"`
241+
MaxIndexes int `json:"maxIndexes"`
242+
} `json:"vectorBuckets,omitempty"`
235243
}{},
236244
}
237245
mockStorage.Features.ImageTransformation.Enabled = true

0 commit comments

Comments
 (0)