Skip to content

Commit

Permalink
Merge pull request #92 from adrianinsaval/4.13.1
Browse files Browse the repository at this point in the history
4.13.1
  • Loading branch information
minrk authored Oct 16, 2024
2 parents 51bb0d2 + 80097a0 commit 22c7d68
Show file tree
Hide file tree
Showing 26 changed files with 217 additions and 140 deletions.
17 changes: 9 additions & 8 deletions .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 7 additions & 6 deletions .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions .azure-pipelines/azure-pipelines-win.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 10 additions & 7 deletions .ci_support/linux_64_occt7.7.2.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cairo:
- '1'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
gmp:
Expand All @@ -28,13 +32,12 @@ libpng:
- '1.6'
occt:
- 7.7.2
pin_run_as_build:
occt:
max_pin: x.x
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cairo:
- '1'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
gmp:
Expand All @@ -27,14 +31,13 @@ liblapack:
libpng:
- '1.6'
occt:
- 7.6.3
pin_run_as_build:
occt:
max_pin: x.x
- 7.8.1
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
15 changes: 9 additions & 6 deletions .ci_support/linux_aarch64_occt7.7.2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ BUILD:
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cairo:
- '1'
cdt_arch:
Expand All @@ -17,7 +21,7 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
gmp:
Expand All @@ -32,13 +36,12 @@ libpng:
- '1.6'
occt:
- 7.7.2
pin_run_as_build:
occt:
max_pin: x.x
target_platform:
- linux-aarch64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ BUILD:
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cairo:
- '1'
cdt_arch:
Expand All @@ -17,7 +21,7 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
gmp:
Expand All @@ -31,14 +35,13 @@ liblapack:
libpng:
- '1.6'
occt:
- 7.6.3
pin_run_as_build:
occt:
max_pin: x.x
- 7.8.1
target_platform:
- linux-aarch64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
15 changes: 9 additions & 6 deletions .ci_support/linux_ppc64le_occt7.7.2.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cairo:
- '1'
cdt_name:
Expand All @@ -13,7 +17,7 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
gmp:
Expand All @@ -28,13 +32,12 @@ libpng:
- '1.6'
occt:
- 7.7.2
pin_run_as_build:
occt:
max_pin: x.x
target_platform:
- linux-ppc64le
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cairo:
- '1'
cdt_name:
Expand All @@ -13,7 +17,7 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
gmp:
Expand All @@ -27,14 +31,13 @@ liblapack:
libpng:
- '1.6'
occt:
- 7.6.3
pin_run_as_build:
occt:
max_pin: x.x
- 7.8.1
target_platform:
- linux-ppc64le
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
17 changes: 9 additions & 8 deletions .ci_support/osx_64_occt7.7.2.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.12'
- '10.13'
c_compiler:
- clang
c_compiler_version:
- '16'
- '17'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.13'
cairo:
- '1'
channel_sources:
Expand All @@ -15,7 +19,7 @@ channel_targets:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '17'
gmp:
- '6'
libblas:
Expand All @@ -30,13 +34,10 @@ macos_machine:
- x86_64-apple-darwin13.4.0
occt:
- 7.7.2
pin_run_as_build:
occt:
max_pin: x.x
target_platform:
- osx-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1.2'
- '1'
Loading

0 comments on commit 22c7d68

Please sign in to comment.