Skip to content

Commit

Permalink
[bot-automerge] r-cli v3.6.2 (#37)
Browse files Browse the repository at this point in the history
automerged PR by conda-forge/automerge-action
  • Loading branch information
github-actions[bot] committed Dec 11, 2023
2 parents 271807b + ad3402e commit 408409e
Show file tree
Hide file tree
Showing 15 changed files with 194 additions and 99 deletions.
8 changes: 3 additions & 5 deletions .azure-pipelines/azure-pipelines-linux.yml

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

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

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

56 changes: 11 additions & 45 deletions .azure-pipelines/azure-pipelines-win.yml

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

17 changes: 0 additions & 17 deletions .ci_support/migrations/r_base43.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions .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:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -13,7 +13,7 @@ cran_mirror:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
- '16'
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_64_r_base4.3.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:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -13,7 +13,7 @@ cran_mirror:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
- '16'
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_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:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -13,7 +13,7 @@ cran_mirror:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
- '16'
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_r_base4.3.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:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -13,7 +13,7 @@ cran_mirror:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
- '16'
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
Expand Down
20 changes: 14 additions & 6 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.

3 changes: 3 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.

27 changes: 17 additions & 10 deletions .scripts/run_osx_build.sh

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

Loading

0 comments on commit 408409e

Please sign in to comment.