Use .ci/merge-fixes.sh in all workflows

Author: Matthias Koeppe

.github/workflows/build.yml

@@ -32,6 +32,12 @@ jobs:
         id: checkout
         uses: actions/checkout@v4
 
+      - name: Merge CI fixes from sagemath/sage
+        run: |
+          .ci/merge-fixes.sh
+        env:
+          GH_TOKEN: ${{ github.token }}
+
       - name: Update system packages
         id: prepare
         run: |

.github/workflows/ci-conda.yml

@@ -51,6 +51,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Merge CI fixes from sagemath/sage
+        run: |
+          .ci/merge-fixes.sh
+        env:
+          GH_TOKEN: ${{ github.token }}
+
       - name: Check for Miniconda
         id: check_conda
         run: echo ::set-output name=installed::$CONDA

.github/workflows/doc-build-pdf.yml

@@ -21,6 +21,12 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Merge CI fixes from sagemath/sage
+        run: |
+          .ci/merge-fixes.sh
+        env:
+          GH_TOKEN: ${{ github.token }}
+
       - name: Prepare
         run: |
           apt-get update && apt-get install -y zip

.github/workflows/doc-build.yml

@@ -19,6 +19,12 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Merge CI fixes from sagemath/sage
+        run: |
+          .ci/merge-fixes.sh
+        env:
+          GH_TOKEN: ${{ github.token }}
+
       - name: Update system packages
         run: |
           apt-get update && apt-get install -y git zip

.github/workflows/docker.yml

@@ -179,6 +179,12 @@ jobs:
           (export PATH=$(pwd)/build/bin:$PATH; (cd upstream && bash -x update-pkgs.sh) && sed -i.bak '/upstream/d' .dockerignore && echo "/:toolchain:/i ADD upstream upstream" | sed -i.bak -f - build/bin/write-dockerfile.sh && git diff)
         if: inputs.upstream_artifact
 
+      - name: Merge CI fixes from sagemath/sage
+        run: |
+          .ci/merge-fixes.sh
+        env:
+          GH_TOKEN: ${{ github.token }}
+
       - name: Try to login to ghcr.io
         if: inputs.docker_push_repository != ''
         # https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable

.github/workflows/lint.yml

@@ -14,6 +14,11 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4
+    - name: Merge CI fixes from sagemath/sage
+      run: |
+        .ci/merge-fixes.sh
+      env:
+        GH_TOKEN: ${{ github.token }}
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
@@ -28,6 +33,11 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4
+    - name: Merge CI fixes from sagemath/sage
+      run: |
+        .ci/merge-fixes.sh
+      env:
+        GH_TOKEN: ${{ github.token }}
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
@@ -42,6 +52,11 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4
+    - name: Merge CI fixes from sagemath/sage
+      run: |
+        .ci/merge-fixes.sh
+      env:
+        GH_TOKEN: ${{ github.token }}
     - name: Set up Python
       uses: actions/setup-python@v4
       with: