diff --git a/.github/workflows/fast-forward.yml b/.github/workflows/fast-forward.yml deleted file mode 100644 index c2c289c04..000000000 --- a/.github/workflows/fast-forward.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Fast-forward - -on: - pull_request_review: - types: - - submitted - -permissions: - contents: write - -jobs: - approved: - if: | - github.event.pull_request.head.ref == 'develop' && - github.event.pull_request.base.ref == 'main' && - github.event.review.state == 'approved' - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v6 - with: - fetch-depth: 0 - - run: | - git checkout main - git merge --ff-only "${{ github.event.pull_request.head.sha }}" - git push origin main - - publish: - needs: - - approved - permissions: - contents: write - packages: write - # Required for npm OIDC - id-token: write - # Call workflow explicitly because events from actions cannot trigger more actions - uses: ./.github/workflows/release.yml - secrets: inherit diff --git a/.github/workflows/release-beta.yml b/.github/workflows/release-beta.yml index fca87826e..89645566d 100644 --- a/.github/workflows/release-beta.yml +++ b/.github/workflows/release-beta.yml @@ -1,6 +1,9 @@ name: Release (Beta) on: + pull_request_review: + types: + - submitted push: branches: - develop @@ -10,6 +13,35 @@ permissions: contents: read jobs: + approved: + if: | + github.event.pull_request.head.ref == 'develop' && + github.event.pull_request.base.ref == 'main' && + github.event.review.state == 'approved' + runs-on: ubuntu-latest + permissions: + contents: write + steps: + - uses: actions/checkout@v6 + with: + fetch-depth: 0 + - run: | + git checkout main + git merge --ff-only "${{ github.event.pull_request.head.sha }}" + git push origin main + + deploy: + needs: + - approved + permissions: + contents: write + packages: write + # Required for npm OIDC + id-token: write + # Call workflow explicitly because events from actions cannot trigger more actions + uses: ./.github/workflows/release.yml + secrets: inherit + release: name: semantic-release runs-on: ubuntu-latest diff --git a/pkg/api/types.gen.go b/pkg/api/types.gen.go index 9483eddbd..5dd91424c 100644 --- a/pkg/api/types.gen.go +++ b/pkg/api/types.gen.go @@ -3407,7 +3407,7 @@ type UpdateApiKeyBody struct { type UpdateAuthConfigBody struct { ApiMaxRequestDuration nullable.Nullable[int] `json:"api_max_request_duration,omitempty"` DbMaxPoolSize nullable.Nullable[int] `json:"db_max_pool_size,omitempty"` - DbMaxPoolSizeUnit nullable.Nullable[UpdateAuthConfigBodyDbMaxPoolSizeUnit] `json:"db_max_pool_size_unit"` + DbMaxPoolSizeUnit nullable.Nullable[UpdateAuthConfigBodyDbMaxPoolSizeUnit] `json:"db_max_pool_size_unit,omitempty"` DisableSignup nullable.Nullable[bool] `json:"disable_signup,omitempty"` ExternalAnonymousUsersEnabled nullable.Nullable[bool] `json:"external_anonymous_users_enabled,omitempty"` ExternalAppleAdditionalClientIds nullable.Nullable[string] `json:"external_apple_additional_client_ids,omitempty"`