Skip to content

Commit

Permalink
ci: Change names for release branches from rel-MAJOR.MINOR to vMAJOR
Browse files Browse the repository at this point in the history
This naming scheme gives us the best support for readthedocs.

References #2814
  • Loading branch information
wolfgangwalther committed Feb 17, 2024
1 parent 06821fd commit 02d8990
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ on:
push:
branches:
- main
- rel-*
- v[0-9]+
tags:
- v*
pull_request:
branches:
- main
- rel-*
- v[0-9]+

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
# Terminate all previous runs of the same workflow for pull requests
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ on:
push:
branches:
- main
- rel-*
- v[0-9]+
pull_request:
branches:
- main
- rel-*
- v[0-9]+

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion nix/tools/release/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ let
}
''
trap "echo You need to be on the main branch or a release branch to proceed. Exiting ..." ERR
[[ "$(git rev-parse --abbrev-ref HEAD)" =~ ^main$|^rel- ]]
[[ "$(git rev-parse --abbrev-ref HEAD)" =~ ^main$|^v[0-9]+$ ]]
trap "" ERR
trap "echo You have uncommitted changes in postgrest.cabal. Exiting ..." ERR
Expand Down

0 comments on commit 02d8990

Please sign in to comment.