Skip to content

Commit

Permalink
Merge pull request #38 from wolfv/clang_98
Browse files Browse the repository at this point in the history
release 98
  • Loading branch information
jakirkham committed Nov 10, 2020
2 parents 43c08d1 + 260a5e5 commit 463f886
Show file tree
Hide file tree
Showing 19 changed files with 212 additions and 134 deletions.
20 changes: 14 additions & 6 deletions .azure-pipelines/azure-pipelines-linux.yml

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

70 changes: 11 additions & 59 deletions .azure-pipelines/azure-pipelines-osx.yml

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

45 changes: 26 additions & 19 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: 7 additions & 0 deletions .ci_support/linux_.yaml → .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ c_compiler:
- gcc
c_compiler_version:
- '7'
cdt_name:
- cos6
channel_sources:
- conda-forge,defaults
channel_targets:
Expand All @@ -12,3 +14,8 @@ cxx_compiler_version:
- '7'
docker_image:
- condaforge/linux-anvil-comp7
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
11 changes: 7 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,16 +3,19 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '9'
- '10'
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '9'
- '10'
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
- '10.9'
target_platform:
- osx-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
11 changes: 4 additions & 7 deletions .ci_support/win_.yaml → .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
c_compiler:
- vs2015
- vs2017
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cxx_compiler:
- vs2015
pin_run_as_build:
vc:
max_pin: x
vc:
- '14'
- vs2017
target_platform:
- win-64
2 changes: 1 addition & 1 deletion .gitattributes

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

2 changes: 1 addition & 1 deletion .github/CODEOWNERS

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

24 changes: 19 additions & 5 deletions .scripts/build_steps.sh

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

18 changes: 15 additions & 3 deletions .scripts/run_docker_build.sh

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

Loading

1 comment on commit 463f886

@conda-forge-linter
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi! This is the friendly automated conda-forge-webservice.

I updated the Github team because of this commit.

  • @wolfv was added to this feedstock maintenance team.

You should get push access to this feedstock and CI services.

Feel free to join the community chat room.

NOTE: Please make sure to not push to the repository directly.
Use branches in your fork for any changes and send a PR.
More details here

Please sign in to comment.