Skip to content

Commit 02d8990

Browse files
ci: Change names for release branches from rel-MAJOR.MINOR to vMAJOR
This naming scheme gives us the best support for readthedocs. References #2814
1 parent 06821fd commit 02d8990

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ on:
44
push:
55
branches:
66
- main
7-
- rel-*
7+
- v[0-9]+
88
tags:
99
- v*
1010
pull_request:
1111
branches:
1212
- main
13-
- rel-*
13+
- v[0-9]+
14+
1415
concurrency:
1516
group: ${{ github.workflow }}-${{ github.ref }}
1617
# Terminate all previous runs of the same workflow for pull requests

.github/workflows/docs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ on:
44
push:
55
branches:
66
- main
7-
- rel-*
7+
- v[0-9]+
88
pull_request:
99
branches:
1010
- main
11-
- rel-*
11+
- v[0-9]+
1212

1313
jobs:
1414
build:

nix/tools/release/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ let
5757
}
5858
''
5959
trap "echo You need to be on the main branch or a release branch to proceed. Exiting ..." ERR
60-
[[ "$(git rev-parse --abbrev-ref HEAD)" =~ ^main$|^rel- ]]
60+
[[ "$(git rev-parse --abbrev-ref HEAD)" =~ ^main$|^v[0-9]+$ ]]
6161
trap "" ERR
6262
6363
trap "echo You have uncommitted changes in postgrest.cabal. Exiting ..." ERR

0 commit comments

Comments
 (0)