Skip to content

Commit f8e98d9

Browse files
authored
Merge pull request #61 from DLR-SC/joergbrech-patch-1
Bump opencascade-static build number and update runners
2 parents a2f77c0 + 452e168 commit f8e98d9

3 files changed

Lines changed: 8 additions & 13 deletions

File tree

.github/workflows/build-conda-packages.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
arch: ['x64']
20-
os: [windows-2019, ubuntu-22.04, macos-latest]
20+
os: [windows-latest, ubuntu-22.04, macos-latest]
2121
python: ['3.9', '3.10', '3.11', '3.12']
2222
exclude:
2323
- arch: x86
@@ -48,15 +48,6 @@ jobs:
4848
python-version: ${{ matrix.python }}
4949
channels: dlr-sc,dlr-sc/label/tigl-dev
5050

51-
- name: Install compiler (macos)
52-
if: contains(matrix.os, 'macos')
53-
shell: bash -l {0}
54-
run: |
55-
/usr/bin/curl -o MacOSX10.9.sdk.tar.xz -L https://github.com/phracker/MacOSX-SDKs/releases/download/10.13/MacOSX10.9.sdk.tar.xz
56-
tar xf MacOSX10.9.sdk.tar.xz
57-
sudo mv MacOSX10.9.sdk /opt/
58-
ls /opt
59-
6051
- name: Install requirements (ubuntu, macos)
6152
if: contains(matrix.os, 'ubuntu') || contains(matrix.os, 'macos')
6253
shell: bash -l {0}
@@ -83,6 +74,10 @@ jobs:
8374
python --version
8475
python build_recipes.py
8576
77+
- name: setup MSVC
78+
if: contains(matrix.os, 'windows')
79+
uses: ilammy/msvc-dev-cmd@v1
80+
8681
- name: build conda packages
8782
if: contains(matrix.os, 'windows')
8883
shell: cmd /C call {0}

conda_build_config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
CONDA_BUILD_SYSROOT:
2-
- /opt/MacOSX10.9.sdk # [osx]
1+
MACOSX_SDK_VERSION:
2+
- '10.14' # [osx]
33

44
c_compiler:
55
- vs2015 # [win]

opencascade-static/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ source:
1515
- dlr-feature-coons_c2.patch
1616

1717
build:
18-
number: 2
18+
number: 3
1919
detect_binary_files_with_prefix: True
2020

2121
requirements:

0 commit comments

Comments
 (0)