Skip to content

Commit

Permalink
Merge pull request #38 from regro-cf-autotick-bot/3.6.3_h4a2536
Browse files Browse the repository at this point in the history 
[bot-automerge] r-cli v3.6.3
  • Loading branch information
@cbrueffer
cbrueffer committed Jun 22, 2024
2 parents 21459ba + 4974c14 commit e9ca9f6
Show file tree
Hide file tree
Showing 22 changed files with 134 additions and 28 deletions.
1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-linux.yml
View file

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

3 changes: 2 additions & 1 deletion .azure-pipelines/azure-pipelines-osx.yml
View file

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
View file
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
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
6 changes: 6 additions & 0 deletions .ci_support/linux_64_r_base4.3.yaml
View file
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
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
6 changes: 6 additions & 0 deletions .ci_support/linux_aarch64_r_base4.2.yaml
View file
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
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
6 changes: 6 additions & 0 deletions .ci_support/linux_aarch64_r_base4.3.yaml
View file
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
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
6 changes: 6 additions & 0 deletions .ci_support/linux_ppc64le_r_base4.2.yaml
View file
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.17'
cdt_name:
- cos7
channel_sources:
Expand All @@ -27,3 +31,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
6 changes: 6 additions & 0 deletions .ci_support/linux_ppc64le_r_base4.3.yaml
View file
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.17'
cdt_name:
- cos7
channel_sources:
Expand All @@ -27,3 +31,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
8 changes: 7 additions & 1 deletion .ci_support/osx_64_r_base4.2.yaml
View file
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:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand Down
8 changes: 7 additions & 1 deletion .ci_support/osx_64_r_base4.3.yaml
View file
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:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand Down
6 changes: 6 additions & 0 deletions .ci_support/osx_arm64_r_base4.2.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
channel_targets:
Expand Down
6 changes: 6 additions & 0 deletions .ci_support/osx_arm64_r_base4.3.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/win_64_.yaml
View file
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_cxx_compiler:
- m2w64-toolchain
pin_run_as_build:
Expand Down
4 changes: 2 additions & 2 deletions .gitattributes
View file

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

25 changes: 23 additions & 2 deletions .gitignore
View file

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

19 changes: 10 additions & 9 deletions .scripts/build_steps.sh
View file

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

6 changes: 6 additions & 0 deletions .scripts/run_docker_build.sh
View file

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

13 changes: 10 additions & 3 deletions .scripts/run_osx_build.sh
View file

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

9 changes: 7 additions & 2 deletions .scripts/run_win_build.bat
View file

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.yml
View file

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
View file

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

Loading

0 comments on commit e9ca9f6

Please sign in to comment.