From c5e944489ca2b4f78bf9c6bb1c495f4133de4d27 Mon Sep 17 00:00:00 2001 From: msftcangoblowme Date: Sat, 31 Aug 2024 06:23:07 +0000 Subject: [PATCH] prevent run on main branch - ci: prevent run on main branch multiple contains --- .github/workflows/branch-test-others.yml | 6 ++++-- CHANGES.rst | 7 +++++++ docs/conf.py | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/branch-test-others.yml b/.github/workflows/branch-test-others.yml index 642df6a..a9c12b4 100644 --- a/.github/workflows/branch-test-others.yml +++ b/.github/workflows/branch-test-others.yml @@ -30,7 +30,8 @@ jobs: # If it doesn't finish in an hour, it's not going to. Don't spin for six # hours needlessly. timeout-minutes: 60 - + if: + ${{ !(contains('-notests, github.ref) || contains(refs/heads/$default-branch', github.ref)) }} strategy: matrix: os: @@ -80,7 +81,8 @@ jobs: success: name: Jobs successful # The tests didn't run if the branch name includes "-notests" - if: "!contains(github.ref, '-notests')" + if: + ${{ !(contains('-notests, github.ref) || contains(refs/heads/$default-branch', github.ref)) }} needs: - tests-other runs-on: ubuntu-latest diff --git a/CHANGES.rst b/CHANGES.rst index 2af8f17..2a2afb5 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -25,6 +25,13 @@ Changelog .. scriv-start-here +.. _changes_1-2-2p0: + +Version 1.2.2.post0 — 2024-08-31 +-------------------------------- + +- ci: prevent run on main branch multiple contains + .. _changes_1-2-2: Version 1.2.2 — 2024-08-31 diff --git a/docs/conf.py b/docs/conf.py index fc450ff..0b7251d 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -39,7 +39,7 @@ # The short X.Y.Z version. version = "1.2.2" # The full version, including alpha/beta/rc tags. -release = "1.2.2" +release = "1.2.2.post0" # The date of release, in "monthname day, year" format. release_date = "August 31, 2024" # @@@ end