Merge branch '6.x' into auto-backport-of-pr-22594-on-6.x

spyder-ide · Sep 28, 2024 · f3d2d5e · f3d2d5e
2 parents 8b8cef8 + 385e650
commit f3d2d5e
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 42 deletions.
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
diff --git a/.github/workflows/test-files.yml b/.github/workflows/test-files.yml
@@ -17,7 +17,6 @@ on:
       - '!installers-conda/**'
       - '!.github/workflows/installers-conda.yml'
       - '!.github/workflows/build-subrepos.yml'
-      - '!.github/workflows/automerge.yml'
 
   pull_request:
     branches:
@@ -35,7 +34,6 @@ on:
       - '!installers-conda/**'
       - '!.github/workflows/installers-conda.yml'
       - '!.github/workflows/build-subrepos.yml'
-      - '!.github/workflows/automerge.yml'
 
   workflow_dispatch:
 

diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
@@ -17,7 +17,6 @@ on:
       - '!installers-conda/**'
       - '!.github/workflows/installers-conda.yml'
       - '!.github/workflows/build-subrepos.yml'
-      - '!.github/workflows/automerge.yml'
 
   pull_request:
     branches:
@@ -35,7 +34,6 @@ on:
       - '!installers-conda/**'
       - '!.github/workflows/installers-conda.yml'
       - '!.github/workflows/build-subrepos.yml'
-      - '!.github/workflows/automerge.yml'
 
   workflow_dispatch:
     inputs:

diff --git a/.github/workflows/test-mac.yml b/.github/workflows/test-mac.yml
@@ -17,7 +17,6 @@ on:
       - '!installers-conda/**'
       - '!.github/workflows/installers-conda.yml'
       - '!.github/workflows/build-subrepos.yml'
-      - '!.github/workflows/automerge.yml'
 
   pull_request:
     branches:
@@ -35,7 +34,6 @@ on:
       - '!installers-conda/**'
       - '!.github/workflows/installers-conda.yml'
       - '!.github/workflows/build-subrepos.yml'
-      - '!.github/workflows/automerge.yml'
 
   workflow_dispatch:
     inputs:

diff --git a/.github/workflows/test-win.yml b/.github/workflows/test-win.yml
@@ -17,7 +17,6 @@ on:
       - '!installers-conda/**'
       - '!.github/workflows/installers-conda.yml'
       - '!.github/workflows/build-subrepos.yml'
-      - '!.github/workflows/automerge.yml'
 
   pull_request:
     branches:
@@ -35,7 +34,6 @@ on:
       - '!installers-conda/**'
       - '!.github/workflows/installers-conda.yml'
       - '!.github/workflows/build-subrepos.yml'
-      - '!.github/workflows/automerge.yml'
 
   workflow_dispatch:
     inputs: