Skip to content

Commit

Permalink
[bot-automerge] r-rms v6.8_1 (#28)
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 May 29, 2024
2 parents c96c0f3 + 38cfa08 commit 9f8588e
Show file tree
Hide file tree
Showing 25 changed files with 259 additions and 184 deletions.
4 changes: 4 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.

6 changes: 5 additions & 1 deletion .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.

6 changes: 6 additions & 0 deletions .ci_support/linux_64_r_base4.2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -27,3 +31,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- fortran_compiler_version
- - c_stdlib_version
- cdt_name
6 changes: 6 additions & 0 deletions .ci_support/linux_64_r_base4.3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -27,3 +31,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- fortran_compiler_version
- - c_stdlib_version
- cdt_name
6 changes: 6 additions & 0 deletions .ci_support/linux_aarch64_r_base4.2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
Expand Down Expand Up @@ -31,3 +35,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- fortran_compiler_version
- - c_stdlib_version
- cdt_name
6 changes: 6 additions & 0 deletions .ci_support/linux_aarch64_r_base4.3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
Expand Down Expand Up @@ -31,3 +35,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- fortran_compiler_version
- - c_stdlib_version
- cdt_name
29 changes: 0 additions & 29 deletions .ci_support/linux_ppc64le_r_base4.2.yaml

This file was deleted.

29 changes: 0 additions & 29 deletions .ci_support/linux_ppc64le_r_base4.3.yaml

This file was deleted.

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

This file was deleted.

10 changes: 8 additions & 2 deletions .ci_support/osx_64_r_base4.2.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand Down
10 changes: 8 additions & 2 deletions .ci_support/osx_64_r_base4.3.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ cran_mirror:
- https://cran.r-project.org
m2w64_c_compiler:
- m2w64-toolchain
m2w64_c_stdlib:
- m2w64-toolchain
m2w64_fortran_compiler:
- m2w64-toolchain
pin_run_as_build:
Expand Down
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.

16 changes: 9 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.

Loading

0 comments on commit 9f8588e

Please sign in to comment.