From 84d9ce804d5abe68231c9e33a206dee75f60ad13 Mon Sep 17 00:00:00 2001
From: Luc Grosheintz <luc.grosheintz@gmail.com>
Date: Fri, 16 Feb 2024 13:52:03 +0100
Subject: [PATCH] Fix when CI is run. (#966)

The tests should run for every PR and when merged into the main or
`v2.x` branch. Docs should be published only when merging into `v2.x`
(for now).
---
 .github/workflows/ci.yml           | 8 +++++---
 .github/workflows/clang_format.yml | 6 ++----
 .github/workflows/coverage.yml     | 7 ++++---
 .github/workflows/gh-pages.yml     | 6 ++++--
 .github/workflows/version_file.yml | 8 +++++---
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8730ed410..cbecbb09e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,12 +7,14 @@ concurrency:
 on:
   push:
     branches:
-      - ci_test
-      - release/**
+      - master
+      - main
+      - v2.x
   pull_request:
     branches:
       - master
-      - release/**
+      - main
+      - v2.x
     paths-ignore:
       - '**.md'
       - '**.rst'
diff --git a/.github/workflows/clang_format.yml b/.github/workflows/clang_format.yml
index 56f2fd8d5..7b9be4909 100644
--- a/.github/workflows/clang_format.yml
+++ b/.github/workflows/clang_format.yml
@@ -8,10 +8,8 @@ on:
   pull_request:
     branches:
       - master
-    paths-ignore:
-      - '**.md'
-      - '**.rst'
-      - 'doc/**'
+      - main
+      - v2.x
 
 jobs:
   Code_Format:
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index b3f4a212b..8728757a8 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -8,12 +8,13 @@ on:
   push:
     branches:
       - master
-      - ci_test
-      - release/**
+      - main
+      - v2.x
   pull_request:
     branches:
       - master
-      - release/**
+      - main
+      - v2.x
     paths-ignore:
       - '**.md'
       - '**.rst'
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
index 2032f91ab..101e7234d 100644
--- a/.github/workflows/gh-pages.yml
+++ b/.github/workflows/gh-pages.yml
@@ -3,10 +3,12 @@ name: gh-pages
 on:
   push:
     branches:
-      - master
+      - v2.x
   pull_request:
     branches:
+      - v2.x
       - master
+      - main
 
 jobs:
 
@@ -39,7 +41,7 @@ jobs:
         cp -r doc/poster build/doc/html/
 
     - name: Deploy to GitHub Pages
-      if: ${{ success() && github.ref == 'refs/heads/master' && github.event_name == 'push' }}
+      if: ${{ success() && github.ref == 'refs/heads/v2.x' && github.event_name == 'push' }}
       uses: crazy-max/ghaction-github-pages@v2
       with:
         target_branch: gh-pages
diff --git a/.github/workflows/version_file.yml b/.github/workflows/version_file.yml
index 816137e95..33ad8bc48 100644
--- a/.github/workflows/version_file.yml
+++ b/.github/workflows/version_file.yml
@@ -3,12 +3,14 @@ name: HighFive Check Version File
 on:
   push:
     branches:
-      - ci_test
-      - release/**
+      - master
+      - main
+      - v2.x
   pull_request:
     branches:
       - master
-      - release/**
+      - main
+      - v2.x
 
 jobs:
   CheckVersion: