Skip to content

Commit

Permalink
Bumped up Ubuntu version
Browse files Browse the repository at this point in the history
  • Loading branch information
jmwright committed Jul 24, 2023
1 parent ce79465 commit 5a9b5ec
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/build-wheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@ jobs:

strategy:
matrix:
os: [ 'ubuntu-20.04', 'macos-11', 'windows-2019' ]
os: [ 'ubuntu-22.04', 'macos-11', 'windows-2019' ]
python-version: [ '3.8', '3.9', '3.10', '3.11' ]

steps:

# see https://github.com/marketplace/actions/download-workflow-artifact
- name: Download artifact
uses: dawidd6/action-download-artifact@v2
if: ${{ matrix.os == 'ubuntu-20.04' }}
if: ${{ matrix.os == 'ubuntu-22.04' }}
with:
workflow: build-vtk.yml
path: /tmp/vtk-wheels

- name: List downloaded wheels
if: ${{ matrix.os == 'ubuntu-20.04' }}
if: ${{ matrix.os == 'ubuntu-22.04' }}
run: |
find /tmp/vtk-wheels -ls
ls -ld /tmp/vtk-wheels/*-cp${{ matrix.python-version }}/vtk-*.whl
Expand Down Expand Up @@ -63,13 +63,13 @@ jobs:
fi
- name: Conda Deps Setup
if: ${{ matrix.os != 'ubuntu-20.04' }}
if: ${{ matrix.os != 'ubuntu-22.04' }}
shell: bash -l {0}
run: |
conda install -c cadquery -n cadquery-ocp -y ocp==7.7.1.* vtk=9.2.*
- name: Conda Deps Setup Linux
if: ${{ matrix.os == 'ubuntu-20.04' }}
if: ${{ matrix.os == 'ubuntu-22.04' }}
shell: bash -l {0}
run: |
conda install -c cadquery -n cadquery-ocp -y ocp==7.7.1.* vtk=9.2.* occt=7.7.1.*
Expand All @@ -82,21 +82,21 @@ jobs:
- name: Pip Deps Setup 2
shell: bash -l {0}
if: ${{ matrix.os == 'ubuntu-20.04' }}
if: ${{ matrix.os == 'ubuntu-22.04' }}
run: |
pip install auditwheel patchelf
- name: Manylinux Build 1
shell: bash -l {0}
if: ${{ matrix.os == 'ubuntu-20.04' }}
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: Conda-only Build
shell: bash -l {0}
if: ${{ matrix.os != 'ubuntu-20.04' }}
if: ${{ matrix.os != 'ubuntu-22.04' }}
run: |
python -m build --no-isolation --wheel
Expand Down

0 comments on commit 5a9b5ec

Please sign in to comment.