Skip to content

Commit

Permalink
[bot-automerge] Rebuild for r-base 4.3 (#13)
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 30, 2023
2 parents 4db4eb0 + b972849 commit 1722676
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 40 deletions.
8 changes: 8 additions & 0 deletions .azure-pipelines/azure-pipelines-linux.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_aarch64_r_base4.2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ channel_targets:
cran_mirror:
- https://cran.r-project.org
docker_image:
- quay.io/condaforge/linux-anvil-aarch64
- quay.io/condaforge/linux-anvil-cos7-x86_64
pin_run_as_build:
r-base:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_r_base4.3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ channel_targets:
cran_mirror:
- https://cran.r-project.org
docker_image:
- quay.io/condaforge/linux-anvil-aarch64
- quay.io/condaforge/linux-anvil-cos7-x86_64
pin_run_as_build:
r-base:
min_pin: x.x
Expand Down
27 changes: 0 additions & 27 deletions .travis.yml

This file was deleted.

9 changes: 1 addition & 8 deletions README.md

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

6 changes: 4 additions & 2 deletions conda-forge.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
bot:
automerge: true
build_platform:
linux_aarch64: linux_64
linux_ppc64le: linux_64
osx_arm64: osx_64
conda_build:
pkg_format: '2'
conda_forge_output_validation: true
github:
branch_name: main
Expand All @@ -11,5 +15,3 @@ provider:
linux_ppc64le: default
win: azure
test: native_and_emulated
conda_build:
pkg_format: '2'
2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ source:
build:
merge_build_host: true # [win]
skip: true # [ppc64le]
number: 1
number: 2
rpaths:
- lib/R/lib/
- lib/
Expand Down

0 comments on commit 1722676

Please sign in to comment.