Merge branch '6.0.x' into 6.1.x

3 years ago · 3e83e744ae
2 changed files with 5 additions and 3 deletions
--- a/.github/workflows/continuous-integration-workflow.yml
+++ b/.github/workflows/continuous-integration-workflow.yml
@ -2,8 +2,8 @@ name: CI
 on:
  push:
-    branches:
+    branches-ignore:
-      - '**'
+      - "dependabot/**"
  schedule:
    - cron: '0 10 * * *' # Once per day at 10am UTC
  workflow_dispatch: # Manual trigger
--- a/.github/workflows/deploy-docs.yml
+++ b/.github/workflows/deploy-docs.yml
@ -1,7 +1,9 @@
 name: Deploy Docs
 on:
  push:
-    branches-ignore: [ gh-pages ]
+    branches-ignore:
      - "gh-pages"
      - "dependabot/**"
    tags: '**'
  repository_dispatch:
    types: request-build-reference # legacy