Merge branch 'sagemath:develop' into develop

Author: fisheryv

.ci/README.md

@@ -121,7 +121,7 @@ jobs:
         # This step needs to happen after the commit sha is put in DOCKER_TAG
         # so that multi-stage builds can work correctly.
         run: |
-          .ci/merge-fixes.sh
+          .github/workflows/merge-fixes.sh
         env:
           GH_TOKEN: ${{ github.token }}
 
@@ -178,13 +178,13 @@ jobs:
           cd /sage
           ./sage -python -m pip install coverage
           ./sage -python -m coverage run --rcfile=src/tox.ini src/bin/sage-runtests --force-lib --long -p4 --format github --random-seed=286735480429121101562228604801325644303 ${{ matrix.tests }}
-        shell: sh .ci/docker-exec-script.sh BUILD . {0}
+        shell: sh .github/workflows/docker-exec-script.sh BUILD . {0}
 
       - name: Combine coverage results
         if: (success() || failure()) && steps.container.outcome == 'success'
         run: |
           ./sage -python -m coverage combine --rcfile=src/tox.ini
-        shell: sh .ci/docker-exec-script.sh BUILD /sage {0}
+        shell: sh .github/workflows/docker-exec-script.sh BUILD /sage {0}
 
       - name: Prepare upload
         id: copy-coverage
@@ -241,7 +241,7 @@ jobs:
         # This step needs to happen after the commit sha is put in DOCKER_TAG
         # so that multi-stage builds can work correctly.
         run: |
-          .ci/merge-fixes.sh
+          .github/workflows/merge-fixes.sh
         env:
           GH_TOKEN: ${{ github.token }}
 
@@ -306,7 +306,7 @@ jobs:
           ./sage -python -m coverage xml --rcfile=src/tox.ini --omit="/tmp/*"
           mkdir -p .coverage/coverage-report
           mv coverage.xml .coverage/coverage-report/
-        shell: sh .ci/docker-exec-script.sh BUILD . {0}
+        shell: sh .github/workflows/docker-exec-script.sh BUILD . {0}
 
       - name: Upload coverage to codecov
         if: (success() || failure()) && steps.container.outcome == 'success'

.ci/head-tail.sh

@@ -48,7 +48,7 @@ jobs:
 
       - name: Merge CI fixes from sagemath/sage
         run: |
-          .ci/merge-fixes.sh
+          .github/workflows/merge-fixes.sh
         env:
           GH_TOKEN: ${{ github.token }}