Skip to content

Commit

Permalink
Merge pull request #5 from conda-forge-linter/conda_forge_admin_4
Browse files Browse the repository at this point in the history
MNT: rerender
  • Loading branch information
hmaarrfk committed Aug 12, 2022
2 parents eb97c52 + a6c8f0b commit fc833b5
Show file tree
Hide file tree
Showing 18 changed files with 208 additions and 147 deletions.
7 changes: 6 additions & 1 deletion .azure-pipelines/azure-pipelines-linux.yml

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

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

76 changes: 24 additions & 52 deletions .azure-pipelines/azure-pipelines-win.yml

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

7 changes: 6 additions & 1 deletion .ci_support/README

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

12 changes: 4 additions & 8 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
c_compiler:
- gcc
c_compiler_version:
- '9'
- '10'
cdt_name:
- cos6
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '9'
- '10'
docker_image:
- quay.io/condaforge/linux-anvil-comp7
- quay.io/condaforge/linux-anvil-cos7-x86_64
jpeg:
- '9'
libpng:
Expand All @@ -29,16 +29,12 @@ pin_run_as_build:
max_pin: x.x
libtiff:
max_pin: x
perl:
max_pin: x.x.x
zlib:
max_pin: x.x
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - cdt_name
- docker_image
zlib:
- '1.2'
7 changes: 0 additions & 7 deletions .ci_support/migrations/perl5321.yaml

This file was deleted.

8 changes: 3 additions & 5 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '11'
- '13'
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '11'
- '13'
jpeg:
- '9'
libpng:
Expand All @@ -29,8 +29,6 @@ pin_run_as_build:
max_pin: x.x
libtiff:
max_pin: x
perl:
max_pin: x.x.x
zlib:
max_pin: x.x
target_platform:
Expand Down
8 changes: 3 additions & 5 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '11'
- '13'
channel_sources:
- conda-forge/label/rust_dev,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '11'
- '13'
jpeg:
- '9'
libpng:
Expand All @@ -29,8 +29,6 @@ pin_run_as_build:
max_pin: x.x
libtiff:
max_pin: x
perl:
max_pin: x.x.x
zlib:
max_pin: x.x
target_platform:
Expand Down
4 changes: 1 addition & 3 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- vs2017
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -21,8 +21,6 @@ pin_run_as_build:
max_pin: x.x
libtiff:
max_pin: x
perl:
max_pin: x.x.x
zlib:
max_pin: x.x
target_platform:
Expand Down
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.

2 changes: 2 additions & 0 deletions .gitattributes

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

26 changes: 19 additions & 7 deletions .scripts/build_steps.sh

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

Loading

0 comments on commit fc833b5

Please sign in to comment.