build.yml, doc-build.yml: First create CI fixes as an artifact, so gh is not needed in the container

Author: Matthias Koeppe

.ci/merge-fixes.sh

@@ -11,21 +11,23 @@ else
     export GIT_AUTHOR_EMAIL="[email protected]"
     export GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"
     export GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"
+    git tag -f test_base
     git commit -q -m "Uncommitted changes" --no-allow-empty -a
     for a in $PRs; do
         echo "::group::Merging PR https://github.com/$REPO/pull/$a"
         git tag -f test_head
         $GH pr checkout -b pr-$a $a
         git fetch --unshallow --all
         git checkout -q test_head
-        if git merge --no-edit -q pr-$a; then
+        if git merge --no-edit --squash -q pr-$a; then
             echo "::endgroup::"
+            git commit -q -m "Merge https://github.com/$REPO/pull/$a" -a --allow-empty
             echo "Merged #$a"
         else
             echo "::endgroup::"
             echo "Failure merging #$a, resetting"
             git reset --hard
         fi
     done
-    git log test_head..HEAD
+    git log test_base..HEAD
 fi

.github/workflows/build.yml

@@ -24,19 +24,34 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
+  get_ci_fixes:
     runs-on: ubuntu-latest
-    container: ghcr.io/sagemath/sage/sage-${{ github.event.inputs.platform || 'ubuntu-focal-standard' }}-with-targets:${{ github.event.inputs.docker_tag || 'dev'}}
     steps:
       - name: Checkout
         id: checkout
         uses: actions/checkout@v4
-
       - name: Merge CI fixes from sagemath/sage
         run: |
           .ci/merge-fixes.sh
         env:
           GH_TOKEN: ${{ github.token }}
+      - name: Store CI fixes in upstream artifact
+        run: |
+          mkdir -p upstream
+          git format-patch --stdout test_base > upstream/ci_fixes.patch
+      - uses: actions/upload-artifact@v2
+        with:
+          path: upstream
+          name: upstream
+
+  build:
+    runs-on: ubuntu-latest
+    container: ghcr.io/sagemath/sage/sage-${{ github.event.inputs.platform || 'ubuntu-focal-standard' }}-with-targets:${{ github.event.inputs.docker_tag || 'dev'}}
+    needs: [get_ci_fixes]
+    steps:
+      - name: Checkout
+        id: checkout
+        uses: actions/checkout@v4
 
       - name: Update system packages
         id: prepare
@@ -74,6 +89,21 @@ jobs:
           if [ ! -f worktree-image/.gitignore ]; then cp .gitignore worktree-image/; fi
           (cd worktree-image && git add -A && git commit --quiet --allow-empty -m "old" -a && git tag -f old && git reset --hard new && git reset --quiet old && git add -N . && git status)
 
+      - name: Download upstream artifact
+        uses: actions/download-artifact@v3
+        with:
+          path: upstream
+          name: upstream
+
+      - name: Apply CI fixes from sagemath/sage
+        # After applying the fixes, make sure all changes are marked as uncommitted changes.
+        run: |
+          if [ -r upstream/ci_fixes.patch ]; then
+            (cd worktree-image && git commit --quiet -m "current changes" --allow-empty -a && git am) < upstream/ci_fixes.patch
+            git reset --quiet old
+            git add -N .
+          fi
+
       - name: Incremental build, test changed files (sage -t --new)
         id: incremental
         run: |

.github/workflows/doc-build.yml

@@ -12,18 +12,33 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build-docs:
+  get_ci_fixes:
     runs-on: ubuntu-latest
-    container: ghcr.io/sagemath/sage/sage-ubuntu-focal-standard-with-targets:dev
     steps:
       - name: Checkout
+        id: checkout
         uses: actions/checkout@v4
-
       - name: Merge CI fixes from sagemath/sage
         run: |
           .ci/merge-fixes.sh
         env:
           GH_TOKEN: ${{ github.token }}
+      - name: Store CI fixes in upstream artifact
+        run: |
+          mkdir -p upstream
+          git format-patch --stdout test_base > upstream/ci_fixes.patch
+      - uses: actions/upload-artifact@v2
+        with:
+          path: upstream
+          name: upstream
+
+  build-docs:
+    runs-on: ubuntu-latest
+    container: ghcr.io/sagemath/sage/sage-ubuntu-focal-standard-with-targets:dev
+    needs: [get_ci_fixes]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
 
       - name: Update system packages
         run: |
@@ -60,6 +75,21 @@ jobs:
           # Keep track of changes to built HTML
           new_version=$(cat src/VERSION.txt); (cd /sage/local/share/doc/sage/html/en && find . -name "*.html" | xargs sed -i '/class="sidebar-brand-text"/s/Sage [0-9a-z.]* /Sage '$new_version' /'; git init && (echo "*.svg binary"; echo "*.pdf binary") >> .gitattributes && (echo ".buildinfo"; echo '*.inv'; echo '.git*'; echo '*.svg'; echo '*.pdf'; echo '*.png'; echo 'searchindex.js') > .gitignore; git add -A && git commit --quiet -m "old")
 
+      - name: Download upstream artifact
+        uses: actions/download-artifact@v3
+        with:
+          path: upstream
+          name: upstream
+
+      - name: Apply CI fixes from sagemath/sage
+        # After applying the fixes, make sure all changes are marked as uncommitted changes.
+        run: |
+          if [ -r upstream/ci_fixes.patch ]; then
+            (cd worktree-image && git commit -m "current changes" --allow-empty -a && git am) < upstream/ci_fixes.patch
+            git reset --quiet old
+            git add -N .
+          fi
+
       - name: Incremental build
         id: incremental
         run: |