Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unvendor zlib #22

Merged
merged 2 commits into from
Apr 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 0 additions & 51 deletions .appveyor.yml

This file was deleted.

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

39 changes: 18 additions & 21 deletions .azure-pipelines/azure-pipelines-osx.yml

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

29 changes: 15 additions & 14 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: 5 additions & 1 deletion .ci_support/linux_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,13 @@ fortran_compiler:
fortran_compiler_version:
- '7'
libcurl:
- '7.64'
- '7'
pin_run_as_build:
bzip2:
max_pin: x
libcurl:
max_pin: x
zlib:
max_pin: x.x
zlib:
- '1.2'
8 changes: 6 additions & 2 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cdt_arch:
cdt_name:
- cos7
channel_sources:
- conda-forge,c4aarch64,defaults
- conda-forge
channel_targets:
- conda-forge main
docker_image:
Expand All @@ -21,9 +21,13 @@ fortran_compiler:
fortran_compiler_version:
- '7'
libcurl:
- '7.64'
- '7'
pin_run_as_build:
bzip2:
max_pin: x
libcurl:
max_pin: x
zlib:
max_pin: x.x
zlib:
- '1.2'
6 changes: 5 additions & 1 deletion .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,13 @@ fortran_compiler:
fortran_compiler_version:
- '8'
libcurl:
- '7.64'
- '7'
pin_run_as_build:
bzip2:
max_pin: x
libcurl:
max_pin: x
zlib:
max_pin: x.x
zlib:
- '1.2'
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '4'
- '9'
channel_sources:
- conda-forge,defaults
channel_targets:
Expand All @@ -15,7 +15,7 @@ fortran_compiler:
fortran_compiler_version:
- '7'
libcurl:
- '7.64'
- '7'
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
Expand All @@ -25,3 +25,7 @@ pin_run_as_build:
max_pin: x
libcurl:
max_pin: x
zlib:
max_pin: x.x
zlib:
- '1.2'
27 changes: 0 additions & 27 deletions .ci_support/osx_fortran_compiler_version4.yaml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
c_compiler:
- vs2015
- vs2017
channel_sources:
- conda-forge,defaults
channel_targets:
Expand Down
26 changes: 26 additions & 0 deletions .drone.yml

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

18 changes: 18 additions & 0 deletions .gitattributes

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

File renamed without changes.
Loading