Merge remote-tracking branch 'origin/master' into hotfix/3.4.0-beta0001

# Conflicts: # .github/workflows/build.yml
Shazwazza · Oct 17, 2024 · f10f0c5 · f10f0c5
2 parents 5fff5b9 + 7301932
commit f10f0c5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,13 +7,15 @@ on:
       - 'master'
       - 'dev'
       - 'release/*'
+      - 'hotfix/*'
     tags: 
       - 'v*'
   pull_request:
     branches:
       - 'master'
       - 'dev'
       - 'release/*'
+      - 'hotfix/*'
 
 jobs:
   build:

diff --git a/.github/workflows/docfx-gh-pages.yml b/.github/workflows/docfx-gh-pages.yml
@@ -4,6 +4,9 @@ on:
   # Runs on pushes targeting the default branch
   push:
     branches: ["feature/docfx"]
+  pull_request:
+    branches:
+      - 'feature/docfx'
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch: