drop! debug CI

CadQuery · Nov 11, 2024 · 47b59c2 · 47b59c2
1 parent 9265208
commit 47b59c2
Show file tree

Hide file tree

Showing 4 changed files with 89 additions and 94 deletions.
diff --git a/.github/workflows/build-vtk.yml b/.github/workflows/build-vtk.yml
@@ -1,7 +1,7 @@
 name: Build VTK from source
 
 on:
-  workflow_dispatch
+  workflow_dispatch:
 
 env:
   PYTHONUTF8: 1
@@ -26,18 +26,9 @@ jobs:
         uses: actions/checkout@v4
 
       - uses: actions/setup-python@v5
-        if: ${{ runner.os != 'macOS' }} # setup-python is currently very broken for macos-14 and possibly 13 too
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Setup Micromamba on MacOS
-        if: ${{ runner.os == 'macOS' }} # setup-python is currently very broken for macos-14 and possibly 13 too
-        uses: mamba-org/setup-micromamba@v1
-        with:
-          environment-name: build-vtk # required by micromamba
-          create-args: >-
-            python=${{ matrix.python-version }}
-
       - name: Setup Python Env
         # shell: bash -l {0}
         # The `bdist_wheel` command requires the `wheel` package
@@ -67,7 +58,7 @@ jobs:
         if: ${{ runner.os == 'macOS' }}
         run: |
           brew install ninja
-          micromamba info
+          # micromamba info
 
       # - name: Windows Deps
       #   shell: bash -l {0} #cmd?
@@ -94,7 +85,7 @@ jobs:
         shell: bash -l {0}
         if: ${{ runner.os == 'macOS' }}
         run: |
-          micromamba info
+          # micromamba info
           python -V
           pip install --upgrade setuptools
           mkdir -p ./vtk/build

diff --git a/.github/workflows/build-wheel.yml b/.github/workflows/build-wheel.yml
@@ -1,9 +1,11 @@
 name: Create Python wheel using Conda
 
 on:
-  workflow_dispatch
-  # push:
-  #   branches: [ master ]
+  workflow_dispatch:
+  push:
+    # branches: [ master ]
+    branches:
+      - py-3-13
 
 env:
   PYTHONUTF8: 1
@@ -38,96 +40,94 @@ jobs:
       #   run: |
       #     find /tmp/vtk-wheels -ls
       #     ls -ld /tmp/vtk-wheels/*-cp${{ matrix.python-version }}/vtk-*.whl
-          
+
       - name: Checkout project
         uses: actions/checkout@v4
 
       # See https://cibuildwheel.readthedocs.io/en/stable/
-      # Not usable for now, because cadquery libraries require glibc 2.31,
-      # but the manylinux images have been created only up to 2.24 (as of 2022-04-11).
-      # - name: Build wheels
-      #   uses: pypa/[email protected]
+      - name: Build wheels
+        uses: pypa/[email protected]
+        with:
+          output-dir: dist
+
+      # # see https://github.com/marketplace/actions/setup-miniconda
+      # - name: Setup Conda
+      #   uses: conda-incubator/setup-miniconda@v2
       #   with:
-      #     output-dir: dist
+      #     #miniforge-version: latest
+      #     miniconda-version: latest
+      #     activate-environment: cadquery-ocp
+      #     python-version: ${{ matrix.python-version }}
+      #     channels: cadquery, conda-forge, defaults
 
-      # see https://github.com/marketplace/actions/setup-miniconda
-      - name: Setup Conda
-        uses: conda-incubator/setup-miniconda@v2
-        with:
-          #miniforge-version: latest
-          miniconda-version: latest
-          activate-environment: cadquery-ocp
-          python-version: ${{ matrix.python-version }}
-          channels: cadquery, conda-forge, defaults
-
-      - name: Ubuntu Deps Setup
-        shell: bash -l {0}
-        run: |
-          if [ "$RUNNER_OS" == "Linux" ]; then
-            sudo apt update
-            sudo apt install -y libegl1 libegl1-mesa-dev
-          fi
-
-      - name: Conda Deps Setup
-        if: ${{ matrix.os != 'ubuntu-22.04' }}
-        shell: bash -l {0}
-        run: |
-          conda install -c cadquery -n cadquery-ocp -y ocp=7.7.2.* vtk=9.2.*
-
-      - name: Conda Deps Setup Linux
-        if: ${{ matrix.os == 'ubuntu-22.04' }}
-        shell: bash -l {0}
-        run: |
-          conda install -c cadquery -n cadquery-ocp -y ocp=7.7.2.* vtk=9.2.* occt=7.7.2=all* auditwheel
-          # Save ~100MiB in shared object size by stripping debugging symbols.
-          # See https://github.com/CadQuery/ocp-build-system/issues/33 for details.
-          echo "Before stripping:"
-          ls -l ~/conda_pkgs_dir/ocp-*/lib/python*/site-packages/OCP*.so /usr/share/miniconda3/envs/cadquery-ocp/lib/python*/site-packages/OCP*.so
-          strip ~/conda_pkgs_dir/ocp-*/lib/python*/site-packages/OCP*.so /usr/share/miniconda3/envs/cadquery-ocp/lib/python*/site-packages/OCP*.so
-          echo "After stripping:"
-          ls -l ~/conda_pkgs_dir/ocp-*/lib/python*/site-packages/OCP*.so /usr/share/miniconda3/envs/cadquery-ocp/lib/python*/site-packages/OCP*.so
-
-      - name: Pip Deps Setup 1
-        shell: bash -l {0}
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install build setuptools wheel requests delocate delvewheel
-
-      - name: Pip Deps Setup 2
-        shell: bash -l {0}
-        if: ${{ matrix.os == 'ubuntu-22.04' }}
-        run: |
-          pip install auditwheel patchelf
-
-      # - name: Manylinux Build 1
+      # - name: Ubuntu Deps Setup
+      #   shell: bash -l {0}
+      #   run: |
+      #     if [ "$RUNNER_OS" == "Linux" ]; then
+      #       sudo apt update
+      #       sudo apt install -y libegl1 libegl1-mesa-dev
+      #     fi
+
+      # - name: Conda Deps Setup
+      #   if: ${{ matrix.os != 'ubuntu-22.04' }}
+      #   shell: bash -l {0}
+      #   run: |
+      #     conda install -c cadquery -n cadquery-ocp -y ocp=7.7.2.* vtk=9.2.*
+
+      # - name: Conda Deps Setup Linux
+      #   if: ${{ matrix.os == 'ubuntu-22.04' }}
+      #   shell: bash -l {0}
+      #   run: |
+      #     conda install -c cadquery -n cadquery-ocp -y ocp=7.7.2.* vtk=9.2.* occt=7.7.2=all* auditwheel
+      #     # Save ~100MiB in shared object size by stripping debugging symbols.
+      #     # See https://github.com/CadQuery/ocp-build-system/issues/33 for details.
+      #     echo "Before stripping:"
+      #     ls -l ~/conda_pkgs_dir/ocp-*/lib/python*/site-packages/OCP*.so /usr/share/miniconda3/envs/cadquery-ocp/lib/python*/site-packages/OCP*.so
+      #     strip ~/conda_pkgs_dir/ocp-*/lib/python*/site-packages/OCP*.so /usr/share/miniconda3/envs/cadquery-ocp/lib/python*/site-packages/OCP*.so
+      #     echo "After stripping:"
+      #     ls -l ~/conda_pkgs_dir/ocp-*/lib/python*/site-packages/OCP*.so /usr/share/miniconda3/envs/cadquery-ocp/lib/python*/site-packages/OCP*.so
+
+      # - name: Pip Deps Setup 1
+      #   shell: bash -l {0}
+      #   run: |
+      #     python -m pip install --upgrade pip
+      #     python -m pip install build setuptools wheel requests delocate delvewheel
+
+      # - name: Pip Deps Setup 2
       #   shell: bash -l {0}
       #   if: ${{ matrix.os == 'ubuntu-22.04' }}
       #   run: |
-      #     export VTK_MANYLINUX=/tmp/vtk-manylinux
-      #     pip install -t $VTK_MANYLINUX --no-deps /tmp/vtk-wheels/*-cp${{ matrix.python-version }}/vtk-*.whl
-      #     python -m build --no-isolation --wheel
+      #     pip install auditwheel patchelf
 
-      - name: Conda-only Build
-        shell: bash -l {0}
-        run: |
-          python -m build --no-isolation --wheel
+      # # - name: Manylinux Build 1
+      # #   shell: bash -l {0}
+      # #   if: ${{ matrix.os == 'ubuntu-22.04' }}
+      # #   run: |
+      # #     export VTK_MANYLINUX=/tmp/vtk-manylinux
+      # #     pip install -t $VTK_MANYLINUX --no-deps /tmp/vtk-wheels/*-cp${{ matrix.python-version }}/vtk-*.whl
+      # #     python -m build --no-isolation --wheel
 
-      - name: Print info
-        shell: bash -l {0}
-        run: |
-          conda info
-          conda list --explicit
-          echo '${{ github.event_name }} ${{ github.ref }}'
+      # - name: Conda-only Build
+      #   shell: bash -l {0}
+      #   run: |
+      #     python -m build --no-isolation --wheel
 
-      # - name: Test wheel
+      # - name: Print info
       #   shell: bash -l {0}
       #   run: |
-      #     conda deactivate
-      #     conda create --yes -n cadquerytest python=${{ matrix.python-version }}
-      #     conda activate cadquerytest
-      #     ls dist/*
-      #     pip install dist/*.whl
-      #     python -c "import OCP;print('OCP imported successfully')"
+      #     conda info
+      #     conda list --explicit
+      #     echo '${{ github.event_name }} ${{ github.ref }}'
+
+      # # - name: Test wheel
+      # #   shell: bash -l {0}
+      # #   run: |
+      # #     conda deactivate
+      # #     conda create --yes -n cadquerytest python=${{ matrix.python-version }}
+      # #     conda activate cadquerytest
+      # #     ls dist/*
+      # #     pip install dist/*.whl
+      # #     python -c "import OCP;print('OCP imported successfully')"
 
       # see https://github.com/marketplace/actions/upload-a-build-artifact
       - name: Upload Artifact

diff --git a/.github/workflows/local-build.yml b/.github/workflows/local-build.yml
@@ -1,9 +1,11 @@
 name: Build Python wheels for MacOS-arm64
 
 on:
-  workflow_dispatch
-  # push:
-  #   branches: [ master ]
+  workflow_dispatch:
+  push:
+    # branches: [ master ]
+    branches:
+      - py-3-13
 
 env:
   PYTHONUTF8: 1

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -3,6 +3,8 @@ name: Releases
 on:
   push:
     tags: [ '*' ]
+    branches:
+      - py-3-13
 
 jobs:
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,8 @@ name: Releases @@
     on:
       push:
         tags: [ '*' ]
+        branches:
+          - py-3-13
     jobs:
@@ Expand Down @@