Skip to content

Commit

Permalink
Merge pull request #23 from regro-cf-autotick-bot/rebuild-r-base44_an…
Browse files Browse the repository at this point in the history
…d_m2w64-ucrt-0-1_ha45b9f

Rebuild for r-base 4.4 and UCRT mingw toolchain
  • Loading branch information
bhaller authored Sep 17, 2024
2 parents 489ed3c + c6e84fb commit 768d384
Show file tree
Hide file tree
Showing 13 changed files with 124 additions and 22 deletions.
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.

12 changes: 9 additions & 3 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
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]
12 changes: 9 additions & 3 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
c_compiler:
- clang
c_compiler_version:
- '16'
- '17'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.13'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '17'
macos_machine:
- x86_64-apple-darwin13.4.0
target_platform:
Expand Down
10 changes: 8 additions & 2 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
c_compiler:
- clang
c_compiler_version:
- '16'
- '17'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '17'
macos_machine:
- arm64-apple-darwin20.0.0
target_platform:
Expand Down
12 changes: 10 additions & 2 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,16 @@ channel_sources:
channel_targets:
- conda-forge main
m2w64_c_compiler:
- m2w64-toolchain
- gcc
m2w64_c_compiler_version:
- '13'
m2w64_c_stdlib:
- m2w64-sysroot
m2w64_c_stdlib_version:
- '12'
m2w64_cxx_compiler:
- m2w64-toolchain
- gxx
m2w64_cxx_compiler_version:
- '13'
target_platform:
- win-64
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.

9 changes: 6 additions & 3 deletions build-locally.py

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

8 changes: 4 additions & 4 deletions conda-forge.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
build_platform:
osx_arm64: osx_64
conda_build:
pkg_format: '2'
conda_forge_output_validation: true
github:
branch_name: main
tooling_branch_name: main
build_platform:
osx_arm64: osx_64
test: native_and_emulated
conda_build:
pkg_format: '2'
4 changes: 3 additions & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,18 @@ source:
sha256: bb63b73e878fb6c15a49f33c3bf1a67047ebb6a11e3d17f930780461dd450400

build:
number: 0
number: 1

requirements:
build:
- make # [not win]
- m2-make # [win]
- cmake
- {{ compiler('c') }} # [not win]
- {{ stdlib("c") }} # [not win]
- {{ compiler('cxx') }} # [not win]
- {{ compiler('m2w64_c') }} # [win]
- {{ stdlib("m2w64_c") }} # [win]
- {{ compiler('m2w64_cxx') }} # [win]
# Full posix environment.
- m2-base # [win]
Expand Down

0 comments on commit 768d384

Please sign in to comment.