Skip to content

Commit

Permalink
Merge pull request #39 from regro-cf-autotick-bot/rebuild-libboost186…
Browse files Browse the repository at this point in the history
…-0-1_h424e3b

Rebuild for libboost 1.86
  • Loading branch information
lrineau authored Aug 23, 2024
2 parents b33667c + 361db07 commit 56e0d34
Show file tree
Hide file tree
Showing 15 changed files with 44 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-osx.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.

6 changes: 3 additions & 3 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ c_compiler_version:
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -19,7 +19,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libboost_devel:
- '1.84'
- '1.86'
mpfr:
- '4'
target_platform:
Expand Down
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_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libboost_devel:
- '1.84'
- '1.86'
mpfr:
- '4'
target_platform:
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 @@ -19,7 +19,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libboost_devel:
- '1.84'
- '1.86'
mpfr:
- '4'
target_platform:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
__migrator:
build_number: 1
kind: version
commit_message: "Rebuild for libboost 1.84"
commit_message: "Rebuild for libboost 1.86"
migration_number: 1
libboost_devel:
- "1.84"
- "1.86"
libboost_python_devel:
- "1.84"
migrator_ts: 1700834511.141209
- "1.86"
migrator_ts: 1723764795.6693385
10 changes: 5 additions & 5 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.9'
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -17,7 +19,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libboost_devel:
- '1.84'
- '1.86'
macos_machine:
- x86_64-apple-darwin13.4.0
mpfr:
Expand All @@ -27,5 +29,3 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- MACOSX_DEPLOYMENT_TARGET
6 changes: 3 additions & 3 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
c_compiler:
- clang
c_compiler_version:
Expand All @@ -17,7 +19,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libboost_devel:
- '1.84'
- '1.86'
macos_machine:
- arm64-apple-darwin20.0.0
mpfr:
Expand All @@ -27,5 +29,3 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- MACOSX_DEPLOYMENT_TARGET
2 changes: 1 addition & 1 deletion .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ channel_targets:
cxx_compiler:
- vs2019
libboost_devel:
- '1.84'
- '1.86'
mpfr:
- '4'
target_platform:
Expand Down
4 changes: 2 additions & 2 deletions .gitattributes

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

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.

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.

2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ source:
sha256: cdb15e7ee31e0663589d3107a79988a37b7b1719df3d24f2058545d1bcdd5837

build:
number: 1
number: 2
skip: true # [win and vc<14]

requirements:
Expand Down

0 comments on commit 56e0d34

Please sign in to comment.