Skip to content

Commit

Permalink
Merge pull request #2 from hobu/master
Browse files Browse the repository at this point in the history
Bump to catch up to more recent dependencies
  • Loading branch information
hobu committed Jan 24, 2022
2 parents c543398 + f96fe0e commit 2ce4d3b
Show file tree
Hide file tree
Showing 16 changed files with 292 additions and 108 deletions.
29 changes: 21 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.

21 changes: 14 additions & 7 deletions .azure-pipelines/azure-pipelines-osx.yml

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

36 changes: 20 additions & 16 deletions .azure-pipelines/azure-pipelines-win.yml

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

10 changes: 7 additions & 3 deletions .ci_support/linux_.yaml → .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
c_compiler:
- gcc
c_compiler_version:
- '7'
- '9'
cdt_name:
- cos6
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
docker_image:
- condaforge/linux-anvil-comp7
- quay.io/condaforge/linux-anvil-cos7-x86_64
libpng:
- '1.6'
pin_run_as_build:
libpng:
max_pin: x.x
zlib:
max_pin: x.x
target_platform:
- linux-64
zlib:
- '1.2'
8 changes: 4 additions & 4 deletions .ci_support/osx_.yaml → .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '9'
- '11'
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
libpng:
- '1.6'
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
- '10.9'
pin_run_as_build:
libpng:
max_pin: x.x
zlib:
max_pin: x.x
target_platform:
- osx-64
zlib:
- '1.2'
4 changes: 3 additions & 1 deletion .ci_support/win_.yaml → .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
libpng:
Expand All @@ -11,5 +11,7 @@ pin_run_as_build:
max_pin: x.x
zlib:
max_pin: x.x
target_platform:
- win-64
zlib:
- '1.2'
3 changes: 2 additions & 1 deletion .gitattributes

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

50 changes: 44 additions & 6 deletions .scripts/build_steps.sh

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

35 changes: 35 additions & 0 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 2ce4d3b

Please sign in to comment.