From 02d8990ce2e721e1411e18002df418f9b6c6e501 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 17 Feb 2024 17:43:03 +0100 Subject: [PATCH] ci: Change names for release branches from rel-MAJOR.MINOR to vMAJOR This naming scheme gives us the best support for readthedocs. References #2814 --- .github/workflows/ci.yaml | 5 +++-- .github/workflows/docs.yaml | 4 ++-- nix/tools/release/default.nix | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f93f01cee9..614d13cfa2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -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 diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 2e3eacc143..216a2ac6e4 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -4,11 +4,11 @@ on: push: branches: - main - - rel-* + - v[0-9]+ pull_request: branches: - main - - rel-* + - v[0-9]+ jobs: build: diff --git a/nix/tools/release/default.nix b/nix/tools/release/default.nix index d7a07e2a29..67e44f114b 100644 --- a/nix/tools/release/default.nix +++ b/nix/tools/release/default.nix @@ -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