Skip to content

Commit

Permalink
Merge pull request #205 from regro-cf-autotick-bot/4.2.0_h34c46c
Browse files Browse the repository at this point in the history
r-base v4.2.0
  • Loading branch information
dpryan79 authored Aug 3, 2022
2 parents d1c4afc + 23a2bf3 commit 187911c
Show file tree
Hide file tree
Showing 22 changed files with 131 additions and 214 deletions.
8 changes: 0 additions & 8 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 .azure-pipelines/azure-pipelines-osx.yml

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

109 changes: 0 additions & 109 deletions .azure-pipelines/azure-pipelines-win.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ jpeg:
krb5:
- '1.19'
libblas:
- 3.8 *netlib
- 3.9 *netlib
libcurl:
- '7'
liblapack:
- 3.8 *netlib
- 3.9 *netlib
libpng:
- '1.6'
libssh2:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ cxx_compiler:
cxx_compiler_version:
- '10'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
- quay.io/condaforge/linux-anvil-aarch64
fortran_compiler:
- gfortran
fortran_compiler_version:
Expand All @@ -39,11 +39,11 @@ jpeg:
krb5:
- '1.19'
libblas:
- 3.8 *netlib
- 3.9 *netlib
libcurl:
- '7'
liblapack:
- 3.8 *netlib
- 3.9 *netlib
libpng:
- '1.6'
libssh2:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler:
cxx_compiler_version:
- '10'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
- quay.io/condaforge/linux-anvil-ppc64le
fortran_compiler:
- gfortran
fortran_compiler_version:
Expand All @@ -35,11 +35,11 @@ jpeg:
krb5:
- '1.19'
libblas:
- 3.8 *netlib
- 3.9 *netlib
libcurl:
- '7'
liblapack:
- 3.8 *netlib
- 3.9 *netlib
libpng:
- '1.6'
libssh2:
Expand Down
10 changes: 5 additions & 5 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '12'
- '13'
cairo:
- '1.16'
channel_sources:
Expand All @@ -15,7 +15,7 @@ channel_targets:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '12'
- '13'
fortran_compiler:
- gfortran
fortran_compiler_version:
Expand All @@ -33,13 +33,13 @@ jpeg:
krb5:
- '1.19'
libblas:
- 3.8 *netlib
- 3.9 *netlib
libcurl:
- '7'
libiconv:
- '1.16'
liblapack:
- 3.8 *netlib
- 3.9 *netlib
libpng:
- '1.6'
libssh2:
Expand All @@ -49,7 +49,7 @@ libtiff:
libxml2:
- '2.9'
llvm_openmp:
- '12'
- '13'
macos_machine:
- x86_64-apple-darwin13.4.0
ncurses:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '12'
- '13'
cairo:
- '1.16'
channel_sources:
Expand All @@ -15,7 +15,7 @@ channel_targets:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '12'
- '13'
fortran_compiler:
- gfortran
fortran_compiler_version:
Expand Down Expand Up @@ -49,7 +49,7 @@ libtiff:
libxml2:
- '2.9'
llvm_openmp:
- '12'
- '13'
macos_machine:
- arm64-apple-darwin20.0.0
ncurses:
Expand Down
16 changes: 0 additions & 16 deletions .ci_support/win_64_.yaml

This file was deleted.

3 changes: 2 additions & 1 deletion .circleci/config.yml

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

9 changes: 8 additions & 1 deletion .scripts/build_steps.sh

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

4 changes: 4 additions & 0 deletions .scripts/run_osx_build.sh

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

27 changes: 27 additions & 0 deletions .travis.yml

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

30 changes: 22 additions & 8 deletions LICENSE.txt

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

Loading

0 comments on commit 187911c

Please sign in to comment.