Skip to content

Commit

Permalink
Merge pull request #121 from ocefpaf/test_without_icu
Browse files Browse the repository at this point in the history
Build with and without icu variants
  • Loading branch information
ocefpaf authored Oct 29, 2024
2 parents 6d1b0cb + d248296 commit 4687d43
Show file tree
Hide file tree
Showing 20 changed files with 310 additions and 33 deletions.
24 changes: 18 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.

14 changes: 10 additions & 4 deletions .azure-pipelines/azure-pipelines-osx.yml

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

Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ libiconv:
- '1'
target_platform:
- linux-64
with_icu:
- 'no'
xz:
- '5'
zip_keys:
Expand Down
33 changes: 33 additions & 0 deletions .ci_support/linux_64_with_icuyes.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
VERBOSE_AT:
- V=1
c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
icu:
- '75'
libiconv:
- '1'
target_platform:
- linux-64
with_icu:
- 'yes'
xz:
- '5'
zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ libiconv:
- '1'
target_platform:
- linux-aarch64
with_icu:
- 'no'
xz:
- '5'
zip_keys:
Expand Down
37 changes: 37 additions & 0 deletions .ci_support/linux_aarch64_with_icuyes.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
VERBOSE_AT:
- V=1
c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
icu:
- '75'
libiconv:
- '1'
target_platform:
- linux-aarch64
with_icu:
- 'yes'
xz:
- '5'
zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ libiconv:
- '1'
target_platform:
- linux-ppc64le
with_icu:
- 'no'
xz:
- '5'
zip_keys:
Expand Down
33 changes: 33 additions & 0 deletions .ci_support/linux_ppc64le_with_icuyes.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
VERBOSE_AT:
- V=1
c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
docker_image:
- quay.io/condaforge/linux-anvil-ppc64le
icu:
- '75'
libiconv:
- '1'
target_platform:
- linux-ppc64le
with_icu:
- 'yes'
xz:
- '5'
zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ macos_machine:
- x86_64-apple-darwin13.4.0
target_platform:
- osx-64
with_icu:
- 'no'
xz:
- '5'
zlib:
Expand Down
32 changes: 32 additions & 0 deletions .ci_support/osx_64_with_icuyes.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
VERBOSE_AT:
- V=1
c_compiler:
- clang_bootstrap
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.13'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
icu:
- '75'
libiconv:
- '1'
macos_machine:
- x86_64-apple-darwin13.4.0
target_platform:
- osx-64
with_icu:
- 'yes'
xz:
- '5'
zlib:
- '1'
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ macos_machine:
- arm64-apple-darwin20.0.0
target_platform:
- osx-arm64
with_icu:
- 'no'
xz:
- '5'
zlib:
Expand Down
32 changes: 32 additions & 0 deletions .ci_support/osx_arm64_with_icuyes.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
VERBOSE_AT:
- V=1
c_compiler:
- clang_bootstrap
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
icu:
- '75'
libiconv:
- '1'
macos_machine:
- arm64-apple-darwin20.0.0
target_platform:
- osx-arm64
with_icu:
- 'yes'
xz:
- '5'
zlib:
- '1'
2 changes: 2 additions & 0 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,7 @@ libiconv:
- '1'
target_platform:
- win-64
with_icu:
- 'no'
zlib:
- '1'
1 change: 0 additions & 1 deletion .scripts/build_steps.sh

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

55 changes: 45 additions & 10 deletions README.md

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

2 changes: 1 addition & 1 deletion recipe/bld.bat
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

cd win32

cscript configure.js compiler=msvc iconv=yes icu=no zlib=yes lzma=no python=no ^
cscript configure.js compiler=msvc iconv=yes icu=%with_icu% zlib=yes lzma=no python=no ^
threads=ctls ^
prefix=%LIBRARY_PREFIX% ^
include=%LIBRARY_INC% ^
Expand Down
Loading

0 comments on commit 4687d43

Please sign in to comment.