ci: update for meson build

inducer · Jul 7, 2024 · ea08d80 · ea08d80
1 parent eb07ff4
commit ea08d80
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 29 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -35,8 +35,10 @@ jobs:
                 python-version: ${{ matrix.python-version }}
         -   name: "Main Script"
             run: |
-                EXTRA_INSTALL="numpy pybind11"
-                curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project.sh
+                PROJECT_INSTALL_FLAGS="--no-build-isolation"
+                EXTRA_INSTALL="numpy pybind11 meson-python ninja"
+
+                curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project.sh
                 . ./build-and-test-py-project.sh
 
     pytest-macos:
@@ -50,14 +52,11 @@ jobs:
                 python-version: '3.x'
         -   name: "Main Script"
             run: |
-                EXTRA_INSTALL="numpy pybind11"
-
-                # https://numpy.org/doc/stable/user/building.html#accelerated-blas-lapack-libraries
-                # e.g. https://github.com/inducer/meshpy/runs/1303881604?check_suite_focus=true
-                export NPY_BLAS_ORDER=""
-                export NPY_LAPACK_ORDER=""
+                export CC=gcc
+                PROJECT_INSTALL_FLAGS="--no-build-isolation"
+                EXTRA_INSTALL="numpy pybind11 meson-python ninja"
 
-                curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project.sh
+                curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project.sh
                 . ./build-and-test-py-project.sh
 
     docs:
@@ -71,8 +70,10 @@ jobs:
                 python-version: '3.x'
         -   name: "Main Script"
             run: |
-                EXTRA_INSTALL="numpy pybind11"
-                curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh
+                PROJECT_INSTALL_FLAGS="--no-build-isolation"
+                EXTRA_INSTALL="numpy pybind11 meson-python ninja"
+
+                curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh
                 . ci-support.sh
                 build_py_project_in_venv
                 build_docs

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, macos-11, windows-2019]
+        os: [ubuntu-20.04, macos-12, windows-2019]
 
     runs-on: ${{ matrix.os }}
 
@@ -41,19 +41,13 @@ jobs:
           python-version: "3.x"
 
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.17.0
-
-      - name: setup xcode version
-        if: startsWith(matrix.os, 'macos')
-        uses: maxim-lobanov/setup-xcode@v1
-        with:
-          xcode-version: '11'
+        run: python -m pip install cibuildwheel==2.19.2
 
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse
         # to supply options, put them in 'env', like:
         env:
-          CIBW_SKIP: "*-musllinux_i686 cp36-* cp37-* pp37-*"
+          CIBW_SKIP: "*-musllinux_i686 cp36-* cp37-* pp37-* pp*-manylinux_i686 *-win32"
 
       - uses: actions/upload-artifact@v4
         with:

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -8,11 +8,13 @@ Ruff:
   - tags
 
 Python 3:
-  script:
-  - py_version=3
-  - EXTRA_INSTALL="numpy pybind11"
-  - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project.sh
-  - ". ./build-and-test-py-project.sh"
+  script: |
+    py_version=3
+    PROJECT_INSTALL_FLAGS="--no-build-isolation"
+    EXTRA_INSTALL="numpy pybind11 meson-python ninja"
+
+    curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project.sh
+    . ./build-and-test-py-project.sh
   tags:
   - python3
   except:
@@ -22,9 +24,11 @@ Python 3:
       junit: test/pytest.xml
 
 Documentation:
-  script:
-  - EXTRA_INSTALL="numpy pybind11"
-  - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-docs.sh
-  - ". ./build-docs.sh"
+  script: |
+    PROJECT_INSTALL_FLAGS="--no-build-isolation"
+    EXTRA_INSTALL="numpy pybind11 meson-python ninja"
+
+    curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-docs.sh
+    . ./build-docs.sh
   tags:
   - python3