Skip to content

Commit 837e2fe

Browse files
jgouxjgoux
authored
Merge branch 'develop' into pamela/growth-739-cli-entitlement-aware-billing-links-for-branches-commands
2 parents 3f3117e + b984cd5 commit 837e2fe

31 files changed

+838
-129
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @supabase/dev-workflows
1+
* @supabase/cli

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2020

21-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
21+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
2222
with:
2323
go-version-file: go.mod
2424
cache: true

‎.github/workflows/automerge.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
# will not occur.
1919
- name: Dependabot metadata
2020
id: meta
21-
uses: dependabot/fetch-metadata@21025c705c08248db411dc16f3619e6b5f9ea21a # v2.5.0
21+
uses: dependabot/fetch-metadata@ffa630c65fa7e0ecfa0625b5ceda64399aea1b36 # v3.0.0
2222
with:
2323
github-token: "${{ secrets.GITHUB_TOKEN }}"
2424

‎.github/workflows/ci.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: CI
22

33
on:
44
pull_request:
5+
merge_group:
56
push:
67
branches:
78
- develop
@@ -16,7 +17,7 @@ jobs:
1617
steps:
1718
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1819

19-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
20+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
2021
with:
2122
go-version-file: go.mod
2223
cache: true
@@ -53,7 +54,7 @@ jobs:
5354
steps:
5455
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5556

56-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
57+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
5758
with:
5859
go-version-file: go.mod
5960
# Linter requires no cache
@@ -70,7 +71,7 @@ jobs:
7071
runs-on: ubuntu-latest
7172
steps:
7273
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
73-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
74+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
7475
with:
7576
go-version-file: go.mod
7677
cache: true
@@ -89,11 +90,11 @@ jobs:
8990

9091
link:
9192
name: Link
92-
if: ${{ !github.event.pull_request.head.repo.fork }}
93+
if: ${{ github.event_name == 'merge_group' || (github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork) }}
9394
runs-on: ubuntu-latest
9495
steps:
9596
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
96-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
97+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
9798
with:
9899
go-version-file: go.mod
99100
cache: true
@@ -109,7 +110,7 @@ jobs:
109110
steps:
110111
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
111112

112-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
113+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
113114
with:
114115
go-version-file: go.mod
115116
cache: true

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ name: "CodeQL"
1313

1414
on:
1515
pull_request:
16+
merge_group:
1617
push:
1718
branches:
1819
- develop
@@ -60,7 +61,7 @@ jobs:
6061

6162
# Initializes the CodeQL tools for scanning.
6263
- name: Initialize CodeQL
63-
uses: github/codeql-action/init@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1
64+
uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
6465
with:
6566
languages: ${{ matrix.language }}
6667
build-mode: ${{ matrix.build-mode }}
@@ -88,6 +89,6 @@ jobs:
8889
exit 1
8990
9091
- name: Perform CodeQL Analysis
91-
uses: github/codeql-action/analyze@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1
92+
uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
9293
with:
9394
category: "/language:${{matrix.language}}"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ jobs:
3434
with:
3535
role-to-assume: ${{ secrets.PROD_AWS_ROLE }}
3636
aws-region: us-east-1
37-
- uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
37+
- uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
3838
with:
3939
registry: public.ecr.aws
40-
- uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
40+
- uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
4141
with:
4242
registry: ghcr.io
4343
username: ${{ github.actor }}

‎.github/workflows/mirror.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
curr: ${{ steps.curr.outputs.tags }}
2828
steps:
2929
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
30-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
30+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
3131
with:
3232
go-version-file: go.mod
3333
cache: true

‎.github/workflows/pg-prove.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
4747
with:
4848
endpoint: builders
49-
- uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
49+
- uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
5050
with:
5151
username: ${{ secrets.DOCKER_USERNAME }}
5252
password: ${{ secrets.DOCKER_PASSWORD }}
@@ -67,7 +67,7 @@ jobs:
6767
runs-on: ubuntu-latest
6868
steps:
6969
- uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
70-
- uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
70+
- uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
7171
with:
7272
username: ${{ secrets.DOCKER_USERNAME }}
7373
password: ${{ secrets.DOCKER_PASSWORD }}

‎.github/workflows/publish-migra.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
4747
with:
4848
endpoint: builders
49-
- uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
49+
- uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
5050
with:
5151
username: ${{ secrets.DOCKER_USERNAME }}
5252
password: ${{ secrets.DOCKER_PASSWORD }}
@@ -67,7 +67,7 @@ jobs:
6767
runs-on: ubuntu-latest
6868
steps:
6969
- uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
70-
- uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
70+
- uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
7171
with:
7272
username: ${{ secrets.DOCKER_USERNAME }}
7373
password: ${{ secrets.DOCKER_PASSWORD }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
with:
4040
fetch-depth: 0
4141

42-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
42+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
4343
with:
4444
go-version-file: go.mod
4545
cache: true
@@ -66,7 +66,7 @@ jobs:
6666
runs-on: ubuntu-latest
6767
steps:
6868
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
69-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
69+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
7070
with:
7171
go-version-file: go.mod
7272
cache: true

0 commit comments

Comments
 (0)