Fix merge conflict

svalinn · Aug 13, 2023 · b9f52ca · b9f52ca
1 parent 60cb020
commit b9f52ca
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/linux_build_test.yml b/.github/workflows/linux_build_test.yml
@@ -12,6 +12,7 @@ on:
       - '.github/workflows/windows_build_test.yml'
       - '.github/workflows/housekeeping.yml'
       - 'CI/**'
+      - 'doc/CHANGELOG.rst'
   push:
     branches:
       - develop
@@ -21,6 +22,7 @@ on:
       - '.github/workflows/windows_build_test.yml'
       - '.github/workflows/housekeeping.yml'
       - 'CI/**'
+      - 'doc/CHANGELOG.rst'
 
 jobs:
   BuildTest:

diff --git a/.github/workflows/mac_build_test.yml b/.github/workflows/mac_build_test.yml
@@ -12,6 +12,8 @@ on:
       - '.github/workflows/windows_build_test.yml'
       - '.github/workflows/housekeeping.yml'
       - 'CI/**'
+      - 'doc/CHANGELOG.rst'
+
   push:
     branches:
       - develop
@@ -21,6 +23,7 @@ on:
       - '.github/workflows/windows_build_test.yml'
       - '.github/workflows/housekeeping.yml'
       - 'CI/**'
+      - 'doc/CHANGELOG.rst'
 
   release:
     types: # This configuration does not affect the page_build event above

diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml
@@ -8,19 +8,22 @@ on:
       - develop
     paths-ignore:
       - '.github/workflows/docker_publish.yml'
-      - '.github/workflows/mac_build_test.yml'
       - '.github/workflows/linux_build_test.yml'
+      - '.github/workflows/mac_build_test.yml'
       - '.github/workflows/housekeeping.yml'
       - 'CI/**'
+      - 'doc/CHANGELOG.rst'
+
   push:
     branches:
       - develop
     paths-ignore:
       - '.github/workflows/docker_publish.yml'
-      - '.github/workflows/mac_build_test.yml'
       - '.github/workflows/linux_build_test.yml'
+      - '.github/workflows/mac_build_test.yml'
       - '.github/workflows/housekeeping.yml'
       - 'CI/**'
+      - 'doc/CHANGELOG.rst'
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}