Skip to content

Commit

Permalink
additional changes to incoporate:
Browse files Browse the repository at this point in the history
Switch to cross-compilation for linux_aarch64 and linux_ppc64le conda-forge#12
=> to work around Travis CI linux-ppc64le job failing (conda-forge/status#185)

Migrate to {{ stdlib("c") }} conda-forge#13
=> use cos7 for all linux platforms (in os_version: of conda-forge.yml)
  • Loading branch information
billysuh7 committed Aug 15, 2024
1 parent 953b54a commit c931e56
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ cxx_compiler:
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-aarch64
- quay.io/condaforge/linux-anvil-cos7-x86_64
target_platform:
- linux-aarch64
zip_keys:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler:
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-ppc64le
- quay.io/condaforge/linux-anvil-cos7-x86_64
target_platform:
- linux-ppc64le
zip_keys:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ c_compiler:
- vs2019
c_stdlib:
- vs
c_stdlib_version:
- '2019'
channel_sources:
- conda-forge
channel_targets:
Expand Down
7 changes: 7 additions & 0 deletions conda-forge.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
build_platform:
linux_aarch64: linux_64
linux_ppc64le: linux_64
conda_build:
error_overlinking: false
conda_forge_output_validation: true
Expand All @@ -7,3 +10,7 @@ github:
provider:
linux_aarch64: default
linux_ppc64le: default
os_version:
linux_64: cos7
linux_aarch64: cos7
linux_ppc64le: cos7

0 comments on commit c931e56

Please sign in to comment.