Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup recipe/cbc.yaml constrains, more platforms #154

Merged
merged 4 commits into from
Jan 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions .azure-pipelines/azure-pipelines-linux.yml

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

14 changes: 4 additions & 10 deletions .azure-pipelines/azure-pipelines-osx.yml

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

7 changes: 2 additions & 5 deletions .azure-pipelines/azure-pipelines-win.yml

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

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ c_stdlib:
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
- conda
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -17,11 +17,9 @@ cxx_compiler:
cxx_compiler_version:
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
- quay.io/condaforge/linux-anvil-x86_64:alma9
go_compiler:
- go-nocgo
nodejs:
- '20'
target_gobin:
- ${PREFIX}/bin/
target_goexe:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ c_stdlib:
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
- conda
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -17,17 +17,15 @@ cxx_compiler:
cxx_compiler_version:
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
- quay.io/condaforge/linux-anvil-x86_64:alma9
go_compiler:
- go-nocgo
nodejs:
- '22'
target_gobin:
- ${PREFIX}/bin/
target_goexe:
- ''
target_platform:
- linux-64
- linux-aarch64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Original file line number Diff line number Diff line change
@@ -1,37 +1,31 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.3'
MACOSX_SDK_VERSION:
- '11.3'
c_compiler:
- clang
- gcc
c_compiler_version:
- '18'
- '13'
c_stdlib:
- macosx_deployment_target
- sysroot
c_stdlib_version:
- '11.3'
- '2.17'
cdt_name:
- conda
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
- gxx
cxx_compiler_version:
- '18'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
go_compiler:
- go-nocgo
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
- '11.3'
nodejs:
- '22'
target_gobin:
- ${PREFIX}/bin/
target_goexe:
- ''
target_platform:
- osx-64
- linux-ppc64le
zip_keys:
- - c_compiler_version
- cxx_compiler_version
10 changes: 3 additions & 7 deletions .ci_support/osx_64_nodejs20.yaml → .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.3'
- '10.14'
MACOSX_SDK_VERSION:
- '11.3'
- '10.14'
c_compiler:
- clang
c_compiler_version:
- '18'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.3'
- '10.14'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -22,10 +22,6 @@ go_compiler:
- go-nocgo
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
- '11.3'
nodejs:
- '20'
target_gobin:
- ${PREFIX}/bin/
target_goexe:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.3'
- '11.0'
MACOSX_SDK_VERSION:
- '11.3'
- '11.0'
c_compiler:
- clang
c_compiler_version:
- '18'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.3'
- '11.0'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -22,10 +22,6 @@ go_compiler:
- go-nocgo
macos_machine:
- arm64-apple-darwin20.0.0
macos_min_version:
- '11.3'
nodejs:
- '20'
target_gobin:
- ${PREFIX}/bin/
target_goexe:
Expand Down
37 changes: 0 additions & 37 deletions .ci_support/osx_arm64_nodejs22.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ m2w64_cxx_compiler:
- gxx
m2w64_cxx_compiler_version:
- '13'
nodejs:
- '20'
target_gobin:
- '%PREFIX%\bin\'
target_goexe:
Expand Down
26 changes: 0 additions & 26 deletions .ci_support/win_64_nodejs22.yaml

This file was deleted.

38 changes: 12 additions & 26 deletions README.md

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

2 changes: 2 additions & 0 deletions conda-forge.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
build_platform:
linux_aarch64: linux_64
linux_ppc64le: linux_64
osx_arm64: osx_64
conda_build:
pkg_format: '2'
Expand Down
17 changes: 2 additions & 15 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,2 @@
c_stdlib_version: # [osx]
- 11.3 # [osx]
macos_min_version: # [osx]
- 11.3 # [osx]
cudnn: # [linux64]
- undefined # [linux64]
cuda_compiler_version: # [linux64]
- None # [linux64]
docker_image: # [linux64]
- quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64]
cdt_name: # [linux64]
- cos7 # [linux64]

c_stdlib_version: # [linux]
- "2.17" # [linux]
c_stdlib_version: # [osx and x86_64]
- 10.14 # [osx and x86_64]
Loading