Skip to content

Commit

Permalink
Merge pull request #345 from bdice/rebuild-libuv-1.48
Browse files Browse the repository at this point in the history
  • Loading branch information
minrk committed Mar 27, 2024
2 parents a6dafaf + 188c6fd commit 7f6eac5
Show file tree
Hide file tree
Showing 16 changed files with 74 additions and 29 deletions.
1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-linux.yml

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

1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-osx.yml

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

6 changes: 6 additions & 0 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
cdt_name:
- cos7
channel_sources:
Expand All @@ -23,5 +27,7 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
6 changes: 6 additions & 0 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -27,5 +31,7 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
7 changes: 0 additions & 7 deletions .ci_support/migrations/icu73.yaml

This file was deleted.

6 changes: 6 additions & 0 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.15'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -25,5 +29,7 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- MACOSX_DEPLOYMENT_TARGET
zlib:
- '1.2'
6 changes: 6 additions & 0 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -23,5 +27,7 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- MACOSX_DEPLOYMENT_TARGET
zlib:
- '1.2'
2 changes: 2 additions & 0 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
c_stdlib:
- vs
channel_sources:
- conda-forge
channel_targets:
Expand Down
25 changes: 23 additions & 2 deletions .gitignore

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

12 changes: 3 additions & 9 deletions .scripts/build_steps.sh

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

6 changes: 6 additions & 0 deletions .scripts/run_docker_build.sh

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

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

8 changes: 5 additions & 3 deletions .scripts/run_win_build.bat

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

4 changes: 2 additions & 2 deletions azure-pipelines.yml

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

5 changes: 3 additions & 2 deletions build-locally.py

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

2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ source:
- 0001-Disable-unsupported-branch-protection.patch # [not win]

build:
number: 0
number: 1
# Prefix replacement breaks in the binary embedded configurations.
detect_binary_files_with_prefix: false
run_exports:
Expand Down

0 comments on commit 7f6eac5

Please sign in to comment.