Skip to content

Commit 3897787

Browse files
committed
Fix azure-build (conda osx missing and MeshDS test segfault)
1 parent a534ada commit 3897787

File tree

3 files changed

+23
-6
lines changed

3 files changed

+23
-6
lines changed

azure-pipelines.yml

+7
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,13 @@ jobs:
4141
py_maj: 3
4242
py_min: 10
4343

44+
- template: conda-build.yml
45+
parameters:
46+
name: Ubuntu_24_04_python310
47+
vmImage: 'ubuntu-24.04'
48+
py_maj: 3
49+
py_min: 10
50+
4451
- template: conda-build.yml
4552
parameters:
4653
name: macOS_12_python310

ci/conda/meta.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ test:
3838
imports:
3939
- OCC
4040
- OCC.Core.BRepPrimAPI
41-
- OCC.Core.MeshDS
4241
- OCC.Core.Tesselator
4342
requires:
4443
- pyqt >=5

conda-build.yml

+16-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
parameters:
22
name: 'Conda build job'
3-
vmImage: 'Ubuntu-18.04'
3+
vmImage: 'ubuntu-22.04'
44
py_maj: '3'
5-
py_min: '6'
5+
py_min: '9'
66

77
jobs:
88
- job: ${{ parameters.name }}
@@ -12,17 +12,28 @@ jobs:
1212
vmImage: ${{ parameters.vmImage }}
1313

1414
steps:
15-
15+
# install conda on osx
16+
- ${{ if contains(parameters.vmImage, 'macOS') }}:
17+
- bash: |
18+
curl -O https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh
19+
bash Miniconda3-latest-MacOSX-x86_64.sh -b -p $HOME/miniconda
20+
echo "##vso[task.prependpath]$HOME/miniconda/bin"
21+
displayName: 'Install Miniconda on macOS'
1622
#activate conda
17-
- ${{ if or(contains(parameters.vmImage, 'macOS'),contains(parameters.vmImage, 'Ubuntu')) }}:
23+
- ${{ if contains(parameters.vmImage, 'macOS') }}:
24+
- bash: |
25+
source $HOME/miniconda/bin/activate
26+
conda init bash
27+
displayName: 'Add conda to PATH'
28+
- ${{ if contains(parameters.vmImage, 'ubuntu') }}:
1829
- bash: echo "##vso[task.prependpath]$CONDA/bin"
1930
displayName: 'Add conda to PATH'
2031
- ${{ if contains(parameters.vmImage, 'win') }}:
2132
- powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
2233
displayName: 'Add conda to PATH'
2334

2435
# Ubuntu install opengl items and remove swig packages that conflict with anaconda
25-
- ${{ if contains(parameters.vmImage, 'Ubuntu') }}:
36+
- ${{ if contains(parameters.vmImage, 'ubuntu') }}:
2637
- bash: |
2738
sudo apt-get update && \
2839
sudo apt-get -q -y install libglu1-mesa-dev libgl1-mesa-dev libxmu-dev libxi-dev && \

0 commit comments

Comments
 (0)