Simplify macos CI and make it more robust

Author: tobiasdiez

.github/workflows/ci-macos.yml

@@ -21,56 +21,39 @@ on:
   pull_request:
     paths:
       - '.github/workflows/ci-macos.yml'
-      - '.github/workflows/macos.yml'
   push:
     tags:
       - '*'
   workflow_dispatch:
     # Allow to run manually
 
-env:
-  TARGETS_PRE: all-sage-local
-  TARGETS: build
-  TARGETS_OPTIONAL: ptest
-
 jobs:
-  stage-1:
-    uses: ./.github/workflows/macos.yml
-    with:
-      stage: "1"
-      timeout: 14400
-
-  stage-2:
-    uses: ./.github/workflows/macos.yml
-    with:
-      stage: "2"
-    needs: [stage-1]
-    if: ${{ success() || failure() }}
-
-  stage-2-optional-0-o:
-    uses: ./.github/workflows/macos.yml
-    with:
-      stage: "2-optional-0-o"
-    needs: [stage-2]
-    if: ${{ success() || failure() }}
-
-  stage-2-optional-p-z:
-    uses: ./.github/workflows/macos.yml
-    with:
-      stage: "2-optional-p-z"
-    needs: [stage-2-optional-0-o]
-    if: ${{ success() || failure() }}
-
-  stage-2-experimental-0-o:
-    uses: ./.github/workflows/macos.yml
-    with:
-      stage: "2-experimental-0-o"
-    needs: [stage-2-optional-p-z]
-    if: ${{ success() || failure() }}
-
-  stage-2-experimental-p-z:
-    uses: ./.github/workflows/macos.yml
-    with:
-      stage: "2-experimental-p-z"
-    needs: [stage-2-experimental-0-o]
-    if: ${{ success() || failure() }}
+  macos:
+    name: Build and Test (macos)
+    runs-on: macos-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
+        
+      - name: Install test prerequisites
+        run: python -m pip install tox
+
+      - name: Install dependencies
+        run: |
+          eval $(build/bin/sage-print-system-package-command homebrew update)
+          eval $(build/bin/sage-print-system-package-command homebrew --yes --ignore-missing install $(build/bin/sage-get-system-packages homebrew $(build/bin/sage-package list :standard:)))
+
+      - name: Build
+        run: |
+          ./bootstrap
+          ./configure --enable-download-from-upstream-url
+          make build V=0
+      
+      - name: Test
+        run: ./sage -t --all -p4
+    

.github/workflows/macos.yml

@@ -1006,8 +1006,7 @@ This is defined in the files
 - :sage_root:`.github/workflows/ci-linux.yml`
   (which calls :sage_root:`.github/workflows/docker.yml`) and
 
-- :sage_root:`.github/workflows/ci-macos.yml`
-  (which calls :sage_root:`.github/workflows/macos.yml`).
+- :sage_root:`.github/workflows/ci-macos.yml`.
 
 GitHub Actions runs these build jobs on 2-core machines with 7 GB of
 RAM memory and 14 GB of SSD disk space, cf.