Skip to content

Commit

Permalink
[bot-automerge] Rebuild for r-base 4.4 and UCRT mingw toolchain (#25)
Browse files Browse the repository at this point in the history
automerged PR by conda-forge/automerge-action
  • Loading branch information
github-actions[bot] authored Jul 18, 2024
2 parents 1c53c91 + bfb04e0 commit 243920d
Show file tree
Hide file tree
Showing 14 changed files with 118 additions and 62 deletions.
16 changes: 8 additions & 8 deletions .azure-pipelines/azure-pipelines-linux.yml

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

14 changes: 0 additions & 14 deletions .ci_support/linux_64_r_base4.2.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion .ci_support/linux_64_r_base4.3.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -11,4 +11,4 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
r_base:
- '4.1'
- '4.4'
50 changes: 50 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,50 @@
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
pr_limit: 20
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]
17 changes: 0 additions & 17 deletions .ci_support/migrations/r_base43.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions .gitattributes

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

25 changes: 23 additions & 2 deletions .gitignore

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

22 changes: 15 additions & 7 deletions .scripts/build_steps.sh

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

4 changes: 2 additions & 2 deletions .scripts/logging_utils.sh

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

9 changes: 9 additions & 0 deletions .scripts/run_docker_build.sh

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

4 changes: 2 additions & 2 deletions README.md

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

5 changes: 3 additions & 2 deletions build-locally.py

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

4 changes: 1 addition & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{% set version = '2.0.0' %}
{% set posix = 'm2-' if win else '' %}
{% set native = 'm2w64-' if win else '' %}

package:
name: r-rsyncrosim
Expand All @@ -13,8 +12,7 @@ source:
sha256: 880efd889e6b9aa32151967955313f28d17206189cdcdd0960f5948d84dd4cf0

build:
merge_build_host: True # [win]
number: 0
number: 1
noarch: generic

rpaths:
Expand Down

0 comments on commit 243920d

Please sign in to comment.