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

fix UCRT migration and update #14

Merged
merged 9 commits into from
Mar 5, 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
10 changes: 9 additions & 1 deletion .azure-pipelines/azure-pipelines-linux.yml

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

5 changes: 4 additions & 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.

20 changes: 3 additions & 17 deletions .azure-pipelines/azure-pipelines-win.yml

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

10 changes: 7 additions & 3 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos6
- conda
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
- quay.io/condaforge/linux-anvil-x86_64:alma9
rust_compiler:
- rust
target_platform:
Expand Down
20 changes: 20 additions & 0 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
c_compiler:
- gcc
c_compiler_version:
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- conda
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
rust_compiler:
- rust
target_platform:
- linux-aarch64
20 changes: 20 additions & 0 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
c_compiler:
- gcc
c_compiler_version:
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- conda
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
rust_compiler:
- rust
target_platform:
- linux-ppc64le
53 changes: 53 additions & 0 deletions .ci_support/migrations/r-base44_and_m2w64-ucrt.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
migrator_ts: 1718391654
__migrator:
kind: version
migration_number: 1
bump_number: 1
commit_message: "Rebuild for r-base 4.4 and UCRT mingw toolchain"
primary_key: r_base
automerge: True
longterm: True
include_noarch: True
include_build: True
pr_limit: 40
override_cbc_keys:
- r-base
- r_base
- m2w64_c_compiler_stub
- m2w64_cxx_compiler_stub
- m2w64_fortran_compiler_stub
ordering:
m2w64_c_compiler:
- m2w64-toolchain
- gcc
m2w64_cxx_compiler:
- m2w64-toolchain
- gxx
m2w64_fortran_compiler:
- m2w64-toolchain
- gfortran
m2w64_c_stdlib:
- m2w64-toolchain
- m2w64-sysroot

r_base:
- 4.3
- 4.4
m2w64_c_compiler: # [win]
- gcc # [win]
m2w64_c_compiler_version: # [win]
- 13 # [win]
m2w64_cxx_compiler: # [win]
- gxx # [win]
m2w64_cxx_compiler_version: # [win]
- 13 # [win]
m2w64_fortran_compiler: # [win]
- gfortran # [win]
m2w64_fortran_compiler_version: # [win]
- 13 # [win]
m2w64_c_stdlib: # [win]
- m2w64-sysroot # [win]
m2w64_c_stdlib_version: # [win]
- 12 # [win]
m2w64_toolchain: # [win]
- disabled # [win]
10 changes: 8 additions & 2 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
c_compiler:
- clang
c_compiler_version:
- '16'
- '18'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand Down
22 changes: 22 additions & 0 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
c_compiler:
- clang
c_compiler_version:
- '18'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
macos_machine:
- arm64-apple-darwin20.0.0
rust_compiler:
- rust
target_platform:
- osx-arm64
6 changes: 4 additions & 2 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
c_compiler:
- vs2019
c_stdlib:
- vs
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
m2w64_c_compiler:
- m2w64-toolchain
rust_compiler:
- rust
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.

3 changes: 3 additions & 0 deletions .gitignore

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

22 changes: 16 additions & 6 deletions .scripts/build_steps.sh

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

57 changes: 40 additions & 17 deletions .scripts/run_osx_build.sh

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

Loading