Merge remote-tracking branch 'upstream/develop' into meson-alpine

Author: tobiasdiez

.devcontainer/portability-archlinux-latest-minimal/devcontainer.json

@@ -0,0 +1,2 @@
+FROM archlinux
+RUN pacman -Syu --noconfirm bash git python

.devcontainer/portability-archlinux-latest-minimal/portability-Dockerfile

@@ -0,0 +1,23 @@
+// See https://aka.ms/devcontainer.json for format details.
+{
+    "name": "archlinux",
+    //"image": "archlinux",
+    "dockerFile": "Dockerfile",
+    "onCreateCommand": ".devcontainer/onCreate-meson.sh || true",
+    "features": {
+        // Git feature is not compatible with Arch Linux, so we install it manually in the Dockerfile 
+        // https://github.com/devcontainers/features/issues/824
+        //"ghcr.io/devcontainers/features/git": {},
+        //"ghcr.io/devcontainers/features/python:1": {},
+        "../uv": {
+			"version": "latest"
+		}
+    },
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "ms-python.python"
+            ]
+        }
+    }
+}

.devcontainer/portability-archlinux-latest-standard/devcontainer.json

@@ -0,0 +1,3 @@
+FROM ghcr.io/void-linux/void-glibc-full
+RUN xbps-install -Suy bash git python
+RUN chsh -s /usr/bin/bash

.devcontainer/portability-archlinux-latest-standard/portability-Dockerfile

@@ -0,0 +1,24 @@
+// See https://aka.ms/devcontainer.json for format details.
+{
+    "name": "void",
+    // Doesn't include 'bash', so we use a custom dockerfile
+    // "image": "ghcr.io/void-linux/void-glibc-full",
+    "dockerFile": "Dockerfile",
+    "onCreateCommand": ".devcontainer/onCreate-meson.sh || true",
+    "features": {
+        // Git feature is not compatible with Void Linux, so we install it manually in the Dockerfile 
+        // https://github.com/devcontainers/features/issues/824
+        //"ghcr.io/devcontainers/features/git": {},
+        //"ghcr.io/devcontainers/features/python:1": {},
+        "../uv": {
+			"version": "latest"
+		}
+    },
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "ms-python.python"
+            ]
+        }
+    }
+}

.devcontainer/portability-archlinux/Dockerfile

@@ -21,56 +21,51 @@ 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() }}
+  macos:
+    name: Build and Test (macos-${{ matrix.version }})
+    runs-on: macos-${{ matrix.version }}
+    strategy:
+      fail-fast: false
+      matrix:
+        version:
+          - '13'
+          - '14'
+          - '15'
 
-  stage-2-optional-0-o:
-    uses: ./.github/workflows/macos.yml
-    with:
-      stage: "2-optional-0-o"
-    needs: [stage-2]
-    if: ${{ success() || failure() }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
 
-  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() }}
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
+        
+      - name: Install test prerequisites
+        run: python -m pip install tox
 
-  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() }}
+      - 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 _bootstrap _prereq $(build/bin/sage-package list :standard:)))
 
-  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() }}
+      - name: Build
+        run: |
+          source ./.homebrew-build-env
+          ./bootstrap
+          ./configure --enable-download-from-upstream-url
+          make build V=0
+        env:
+          MAKE: 'make -j6'
+      
+      - name: Test
+        run: |
+          source ./.homebrew-build-env # Needed so that runtime cython can find the dependencies
+          ./sage -t --all -p4
+    

.devcontainer/portability-archlinux/devcontainer.json

@@ -36,7 +36,7 @@ jobs:
             tests: 'new'
           # one additional editable run in pull_request, this has no effect if not pull_request
           - os: 'ubuntu'
-            python: 3.12
+            python: '3.12'
             editable: true
             tests: 'all'
           - os: windows
@@ -185,5 +185,5 @@ jobs:
         uses: actions/upload-artifact@v4.5.0
         if: failure()
         with:
-          name: ${{ runner.os }}-meson-${{ matrix.python }}${{ matrix.editable && '-editable' || '' }}-log
+          name: ${{ runner.os }}-meson-${{ matrix.python }}${{ matrix.editable && '-editable' || '' }}${{ matrix.tests == 'new' && '-new' || '' }}-log
           path: builddir/meson-logs/