From d0600526912f1222804f550ceed191f882762698 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Tue, 10 Oct 2023 20:46:56 -0700
Subject: [PATCH] .github/workflows/build.yml: Merge ci-linux-incremental.yml

---
 .github/workflows/build.yml                |  92 ++++++++++++++
 .github/workflows/ci-linux-incremental.yml | 132 ---------------------
 2 files changed, 92 insertions(+), 132 deletions(-)
 delete mode 100644 .github/workflows/ci-linux-incremental.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e5a8c164ea8..4dedaff614f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -49,6 +49,31 @@ jobs:
           path: upstream
           name: upstream
 
+  changed_files:
+    runs-on: ubuntu-latest
+    name: List changed packages
+    outputs:
+      uninstall_targets: ${{ steps.build-targets.outputs.uninstall_targets }}
+      build_targets:     ${{ steps.build-targets.outputs.build_targets }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Get all packages that have changed
+        id: changed-packages
+        uses: tj-actions/changed-files@v38
+        with:
+          files_yaml: |
+            configures:
+              - 'build/pkgs/*/spkg-configure.m4'
+            pkgs:
+              - 'build/pkgs/**'
+              - 'pkgs/**'
+      - name: Determine targets to build
+        id: build-targets
+        run: |
+          echo "uninstall_targets=$(echo $(for a in '' ${{ steps.changed-packages.outputs.configures_all_changed_files }}; do echo $a | sed -E 's,build/pkgs/([_.a-z0-9]*)/spkg-configure[.]m4 *,\1-uninstall,'; done | sort -u))" >> $GITHUB_OUTPUT
+          echo "build_targets=$(echo $(for a in '' ${{ steps.changed-packages.outputs.pkgs_all_changed_files }}; do echo $a | sed -E 's,-,_,g;s,(build/)?pkgs/([-_.a-z0-9]*)/[^ ]* *,\2-ensure,;'; done | sort -u))" >> $GITHUB_OUTPUT
+          cat $GITHUB_OUTPUT
+
   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'}}
@@ -163,6 +188,73 @@ jobs:
         with:
           files: ./worktree-image/coverage.xml
 
+  linux-standard:
+    needs: [changed_files]
+    if: "${{needs.changed_files.outputs.uninstall_targets}}${{needs.changed_files.outputs.build_targets}}"
+    uses: ./.github/workflows/docker.yml
+    with:
+      # Build incrementally from published Docker image
+      incremental: true
+      free_disk_space: true
+      from_docker_repository: ghcr.io/sagemath/sage/
+      from_docker_target: "with-targets"
+      from_docker_tag: "dev"
+      docker_targets: "with-targets"
+      targets: "${{needs.changed_files.outputs.uninstall_targets}} ${{needs.changed_files.outputs.build_targets}} build doc-html ptest"
+      tox_system_factors: >-
+        ["ubuntu-focal", "ubuntu-jammy", "ubuntu-mantic", "debian-bullseye", "debian-bookworm",
+         "fedora-30", "fedora-38", "gentoo-python3.11", "debian-bullseye-i386"]
+      tox_packages_factors: >-
+          ["standard"]
+      docker_push_repository: ghcr.io/${{ github.repository }}/
+    permissions:
+      packages: write
+
+  linux-standard-sitepackages:
+    needs: [changed_files]
+    if: "${{needs.changed_files.outputs.uninstall_targets}}${{needs.changed_files.outputs.build_targets}}"
+    uses: ./.github/workflows/docker.yml
+    with:
+      # Build incrementally from published Docker image
+      incremental: true
+      free_disk_space: true
+      from_docker_repository: ghcr.io/sagemath/sage/
+      from_docker_target: "with-targets"
+      from_docker_tag: "dev"
+      docker_targets: "with-targets"
+      targets: "${{needs.changed_files.outputs.uninstall_targets}} ${{needs.changed_files.outputs.build_targets}} build doc-html ptest"
+      # Only test systems with a usable system python (>= 3.9)
+      tox_system_factors: >-
+        ["ubuntu-jammy", "ubuntu-mantic", "debian-bullseye", "debian-bookworm",
+         "fedora-33", "fedora-38", "gentoo-python3.11", "archlinux", "debian-bullseye-i386"]
+      tox_packages_factors: >-
+          ["standard-sitepackages"]
+      docker_push_repository: ghcr.io/${{ github.repository }}/
+    permissions:
+      packages: write
+
+  linux-minimal:
+    needs: [changed_files]
+    if: "${{needs.changed_files.outputs.uninstall_targets}}${{needs.changed_files.outputs.build_targets}}"
+    uses: ./.github/workflows/docker.yml
+    with:
+      # Build incrementally from published Docker image
+      incremental: true
+      free_disk_space: true
+      from_docker_repository: ghcr.io/sagemath/sage/
+      from_docker_target: "with-targets"
+      from_docker_tag: "dev"
+      docker_targets: "with-targets"
+      targets: "${{needs.changed_files.outputs.uninstall_targets}} ${{needs.changed_files.outputs.build_targets}} build doc-html ptest"
+      tox_system_factors: >-
+        ["ubuntu-focal", "ubuntu-jammy", "ubuntu-mantic", "debian-bullseye", "debian-bookworm",
+         "fedora-30", "fedora-38", "gentoo-python3.11", "debian-bullseye-i386"]
+      tox_packages_factors: >-
+          ["minimal"]
+      docker_push_repository: ghcr.io/${{ github.repository }}/
+    permissions:
+      packages: write
+
   build-docs:
     runs-on: ubuntu-latest
     container: ghcr.io/sagemath/sage/sage-ubuntu-focal-standard-with-targets:dev
diff --git a/.github/workflows/ci-linux-incremental.yml b/.github/workflows/ci-linux-incremental.yml
deleted file mode 100644
index a4aa9ae99c7..00000000000
--- a/.github/workflows/ci-linux-incremental.yml
+++ /dev/null
@@ -1,132 +0,0 @@
-name: CI Linux incremental
-
-## This GitHub Actions workflow runs SAGE_ROOT/tox.ini with select environments,
-## whenever a GitHub pull request is opened or synchronized in a repository
-## where GitHub Actions are enabled.
-##
-## It builds and checks some sage spkgs as defined in TARGETS.
-##
-## A job succeeds if there is no error.
-##
-## The build is run with "make V=0", so the build logs of individual packages are suppressed.
-##
-## At the end, all package build logs that contain an error are printed out.
-##
-## After all jobs have finished (or are canceled) and a short delay,
-## tar files of all logs are made available as "build artifacts".
-
-on:
-  pull_request:
-    types:
-      # Defaults
-      - opened
-      - synchronize
-      - reopened
-      # When a CI label is added
-      - labeled
-  workflow_dispatch:
-
-concurrency:
-  # Cancel previous runs of this workflow for the same branch
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-permissions:
-  packages: write
-
-jobs:
-
-  changed_files:
-    runs-on: ubuntu-latest
-    name: List changed packages
-    outputs:
-      uninstall_targets: ${{ steps.build-targets.outputs.uninstall_targets }}
-      build_targets:     ${{ steps.build-targets.outputs.build_targets }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Get all packages that have changed
-        id: changed-packages
-        uses: tj-actions/changed-files@v38
-        with:
-          files_yaml: |
-            configures:
-              - 'build/pkgs/*/spkg-configure.m4'
-            pkgs:
-              - 'build/pkgs/**'
-              - 'pkgs/**'
-      - name: Determine targets to build
-        id: build-targets
-        run: |
-          echo "uninstall_targets=$(echo $(for a in '' ${{ steps.changed-packages.outputs.configures_all_changed_files }}; do echo $a | sed -E 's,build/pkgs/([_.a-z0-9]*)/spkg-configure[.]m4 *,\1-uninstall,'; done | sort -u))" >> $GITHUB_OUTPUT
-          echo "build_targets=$(echo $(for a in '' ${{ steps.changed-packages.outputs.pkgs_all_changed_files }}; do echo $a | sed -E 's,-,_,g;s,(build/)?pkgs/([-_.a-z0-9]*)/[^ ]* *,\2-ensure,;'; done | sort -u))" >> $GITHUB_OUTPUT
-          cat $GITHUB_OUTPUT
-
-  test:
-    needs: [changed_files]
-    if: |
-      github.event_name != 'pull_request' ||
-      ((github.event.action != 'labeled' &&
-         (contains(github.event.pull_request.labels.*.name, 'c: packages: standard') ||
-          contains(github.event.pull_request.labels.*.name, 'c: packages: optional'))) ||
-       (github.event.action == 'labeled' &&
-         (github.event.label.name == 'c: packages: optional' ||
-          github.event.label.name == 'c: packages: standard')))
-    uses: ./.github/workflows/docker.yml
-    with:
-      # Build incrementally from published Docker image
-      incremental: true
-      free_disk_space: true
-      from_docker_repository: ghcr.io/sagemath/sage/
-      from_docker_target: "with-targets"
-      from_docker_tag: "dev"
-      docker_targets: "with-targets"
-      targets: "${{needs.changed_files.outputs.uninstall_targets}} ${{needs.changed_files.outputs.build_targets}} build doc-html ptest"
-      tox_system_factors: >-
-        ["ubuntu-focal",
-         "ubuntu-jammy",
-         "ubuntu-mantic",
-         "debian-bullseye",
-         "debian-bookworm",
-         "fedora-30",
-         "fedora-38",
-         "gentoo-python3.11",
-         "debian-bullseye-i386"]
-      tox_packages_factors: >-
-          ["standard",
-           "minimal"]
-      docker_push_repository: ghcr.io/${{ github.repository }}/
-
-  site:
-    needs: [changed_files]
-    if: |
-      github.event_name != 'pull_request' ||
-      ((github.event.action != 'labeled' &&
-         (contains(github.event.pull_request.labels.*.name, 'c: packages: standard') ||
-          contains(github.event.pull_request.labels.*.name, 'c: packages: optional'))) ||
-       (github.event.action == 'labeled' &&
-         (github.event.label.name == 'c: packages: optional' ||
-          github.event.label.name == 'c: packages: standard')))
-    uses: ./.github/workflows/docker.yml
-    with:
-      # Build incrementally from published Docker image
-      incremental: true
-      free_disk_space: true
-      from_docker_repository: ghcr.io/sagemath/sage/
-      from_docker_target: "with-targets"
-      from_docker_tag: "dev"
-      docker_targets: "with-targets"
-      targets: "${{needs.changed_files.outputs.uninstall_targets}} ${{needs.changed_files.outputs.build_targets}} build doc-html ptest"
-      # Only test systems with a usable system python (>= 3.9)
-      tox_system_factors: >-
-        ["ubuntu-jammy",
-         "ubuntu-mantic",
-         "debian-bullseye",
-         "debian-bookworm",
-         "fedora-33",
-         "fedora-38",
-         "gentoo-python3.11",
-         "archlinux",
-         "debian-bullseye-i386"]
-      tox_packages_factors: >-
-          ["standard-sitepackages"]
-      docker_push_repository: ghcr.io/${{ github.repository }}/