Skip to content

Commit

Permalink
improve (ignore_)run_exports, don't refer to -ng packages (#14)
Browse files Browse the repository at this point in the history
* remove obsolete pins

* add stdlib

* cross-compile linux arches

* rely on compiler run-exports

* fix run-export situation, reenable error_overlinking

* MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.38.0, and conda-forge-pinning 2024.08.14.18.26.09
  • Loading branch information
h-vetinari authored Aug 15, 2024
1 parent e867cfb commit c6bb701
Show file tree
Hide file tree
Showing 17 changed files with 115 additions and 69 deletions.
8 changes: 8 additions & 0 deletions .azure-pipelines/azure-pipelines-linux.yml

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

2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-win.yml

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

13 changes: 10 additions & 3 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
clangdev:
- 18.*
- '18'
cxx_compiler:
- gxx
cxx_compiler_version:
Expand All @@ -16,7 +20,10 @@ libxml2:
- '2'
target_platform:
- linux-64
zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
zstd:
- '1.5'
13 changes: 10 additions & 3 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -9,18 +13,21 @@ channel_sources:
channel_targets:
- conda-forge main
clangdev:
- 18.*
- '18'
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-aarch64
- quay.io/condaforge/linux-anvil-cos7-x86_64
libxml2:
- '2'
target_platform:
- linux-aarch64
zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
zstd:
- '1.5'
29 changes: 29 additions & 0 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
clangdev:
- '18'
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libxml2:
- '2'
target_platform:
- linux-ppc64le
zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1'
zstd:
- '1.5'
8 changes: 6 additions & 2 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@ MACOSX_DEPLOYMENT_TARGET:
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.13'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
clangdev:
- 18.*
- '18'
cxx_compiler:
- clang_bootstrap
cxx_compiler_version:
Expand All @@ -19,6 +23,6 @@ macos_machine:
target_platform:
- osx-64
zlib:
- '1.2'
- '1'
zstd:
- '1.5'
8 changes: 6 additions & 2 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@ MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
clangdev:
- 18.*
- '18'
cxx_compiler:
- clang_bootstrap
cxx_compiler_version:
Expand All @@ -19,6 +23,6 @@ macos_machine:
target_platform:
- osx-arm64
zlib:
- '1.2'
- '1'
zstd:
- '1.5'
6 changes: 4 additions & 2 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
c_stdlib:
- vs
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
clangdev:
- 18.*
- '18'
cxx_compiler:
- vs2019
libxml2:
- '2'
target_platform:
- win-64
zlib:
- '1.2'
- '1'
zstd:
- '1.5'
6 changes: 6 additions & 0 deletions .scripts/build_steps.sh

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

9 changes: 8 additions & 1 deletion .scripts/run_osx_build.sh

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

5 changes: 5 additions & 0 deletions .scripts/run_win_build.bat

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

25 changes: 0 additions & 25 deletions .travis.yml

This file was deleted.

17 changes: 9 additions & 8 deletions README.md

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

4 changes: 2 additions & 2 deletions build-locally.py

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

6 changes: 4 additions & 2 deletions conda-forge.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
build_platform: {osx_arm64: osx_64}
build_platform:
linux_aarch64: linux_64
linux_ppc64le: linux_64
osx_arm64: osx_64
conda_forge_output_validation: true
provider: {linux_aarch64: default, win: azure}
github:
branch_name: main
tooling_branch_name: main
Expand Down
6 changes: 1 addition & 5 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
clangdev:
- 18.*
- 18

c_stdlib_version: # [linux]
- 2.17 # [linux]
c_compiler: # [osx]
- clang_bootstrap # [osx]
cxx_compiler: # [osx]
- clang_bootstrap # [osx]
MACOSX_SDK_VERSION: # [osx and x86_64]
- 10.12 # [osx and x86_64]
Loading

0 comments on commit c6bb701

Please sign in to comment.