Skip to content

Commit

Permalink
[bot-automerge] Rebuild for r-base 4.3 (#11)
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 Jun 16, 2023
2 parents 9169452 + d2f1041 commit a651336
Show file tree
Hide file tree
Showing 13 changed files with 62 additions and 34 deletions.
8 changes: 4 additions & 4 deletions .azure-pipelines/azure-pipelines-linux.yml

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

6 changes: 3 additions & 3 deletions .azure-pipelines/azure-pipelines-osx.yml

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

4 changes: 2 additions & 2 deletions .azure-pipelines/azure-pipelines-win.yml

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

2 changes: 1 addition & 1 deletion .ci_support/linux_64_r_base4.2.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '11'
- '12'
cdt_name:
- cos6
channel_sources:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '11'
- '12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -17,6 +17,6 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
r_base:
- '4.1'
- '4.3'
target_platform:
- linux-64
17 changes: 17 additions & 0 deletions .ci_support/migrations/r_base43.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
migrator_ts: 1682187595
__migrator:
kind: version
migration_number: 1
bump_number: 1
operation: key_add
commit_message: "Rebuild for r-base 4.3"
primary_key: r_base
automerge: True
longterm: True
include_noarch: True
pr_limit: 40
conda_forge_yml_patches:
provider.win_64: win_disabled

r_base:
- 4.3 # [not win]
2 changes: 1 addition & 1 deletion .ci_support/osx_64_r_base4.2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '14'
- '15'
channel_sources:
- conda-forge
channel_targets:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '14'
- '15'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -17,6 +17,6 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
r_base:
- '4.1'
- '4.3'
target_platform:
- osx-64
4 changes: 2 additions & 2 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/run_osx_build.sh

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

31 changes: 21 additions & 10 deletions README.md

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,10 +1,10 @@
bot:
automerge: true
provider:
win: azure
conda_build:
pkg_format: '2'
conda_forge_output_validation: true
github:
branch_name: main
tooling_branch_name: main
conda_build:
pkg_format: '2'
provider:
win: azure
2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ source:

build:
merge_build_host: True # [win]
number: 0
number: 1
rpaths:
- lib/R/lib/
- lib/
Expand Down

0 comments on commit a651336

Please sign in to comment.