Skip to content

Commit

Permalink
Merge pull request #52 from h-vetinari/rc
Browse files Browse the repository at this point in the history
lld 16.0.0.rc1
  • Loading branch information
h-vetinari authored Feb 5, 2023
2 parents 8b6da75 + 1ae10a0 commit 3ba31c0
Show file tree
Hide file tree
Showing 20 changed files with 155 additions and 150 deletions.
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.

73 changes: 25 additions & 48 deletions .azure-pipelines/azure-pipelines-win.yml

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

12 changes: 6 additions & 6 deletions .ci_support/README

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

9 changes: 2 additions & 7 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '10'
- '11'
cdt_name:
- cos6
channel_sources:
Expand All @@ -11,16 +11,11 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
pin_run_as_build:
zlib:
max_pin: x.x
target_platform:
- linux-64
vc:
- '14'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
9 changes: 2 additions & 7 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BUILD:
c_compiler:
- gcc
c_compiler_version:
- '10'
- '11'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -15,16 +15,11 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-aarch64
pin_run_as_build:
zlib:
max_pin: x.x
target_platform:
- linux-aarch64
vc:
- '14'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
9 changes: 2 additions & 7 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '10'
- '11'
cdt_name:
- cos7
channel_sources:
Expand All @@ -11,16 +11,11 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-ppc64le
pin_run_as_build:
zlib:
max_pin: x.x
target_platform:
- linux-ppc64le
vc:
- '14'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
5 changes: 0 additions & 5 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,8 @@ cxx_compiler_version:
- '*'
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
zlib:
max_pin: x.x
target_platform:
- osx-64
vc:
- '14'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
5 changes: 0 additions & 5 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,8 @@ cxx_compiler_version:
- '*'
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
zlib:
max_pin: x.x
target_platform:
- osx-arm64
vc:
- '14'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
7 changes: 1 addition & 6 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,7 @@ channel_targets:
cxx_compiler:
- vs2019
libxml2:
- '2.9'
pin_run_as_build:
libxml2:
max_pin: x.x
zlib:
max_pin: x.x
- '2.10'
target_platform:
- win-64
vc:
Expand Down
5 changes: 3 additions & 2 deletions .circleci/config.yml

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

2 changes: 1 addition & 1 deletion .github/workflows/webservices.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
steps:
- name: webservices
id: webservices
uses: conda-forge/webservices-dispatch-action@master
uses: conda-forge/webservices-dispatch-action@main
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }}
13 changes: 10 additions & 3 deletions .scripts/build_steps.sh

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

9 changes: 6 additions & 3 deletions .scripts/run_osx_build.sh

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 3ba31c0

Please sign in to comment.