Skip to content

Commit

Permalink
Merge pull request #126 from xhochy/bash-activation-windows
Browse files Browse the repository at this point in the history
Ensure bash activation scripts use LF line endings
  • Loading branch information
ocefpaf authored Jul 11, 2024
2 parents 91bff91 + e13a45b commit a1f7bd6
Show file tree
Hide file tree
Showing 11 changed files with 37 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ c_compiler_version:
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -28,4 +28,4 @@ zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
- '1'
2 changes: 1 addition & 1 deletion .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ target_platform:
xz:
- '5'
zlib:
- '1.2'
- '1'
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ target_platform:
xz:
- '5'
zlib:
- '1.2'
- '1'
2 changes: 1 addition & 1 deletion .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ libiconv:
target_platform:
- win-64
zlib:
- '1.2'
- '1'
7 changes: 7 additions & 0 deletions .scripts/build_steps.sh

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

7 changes: 7 additions & 0 deletions .scripts/run_osx_build.sh

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

5 changes: 5 additions & 0 deletions .scripts/run_win_build.bat

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

2 changes: 1 addition & 1 deletion recipe/activate.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /bin/sh
#!/bin/sh

if test -n "${XML_CATALOG_FILES:-}"; then
xml_catalog_files_libxml2="${XML_CATALOG_FILES}"
Expand Down
10 changes: 9 additions & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ source:
- 0002-Make-and-install-a-pkg-config-file-on-Windows.patch

build:
number: 1
number: 2
run_exports:
# remove symbols at minor versions according to
# https://abi-laboratory.pro/tracker/timeline/libxml2/
Expand All @@ -38,10 +38,18 @@ requirements:
- zlib

test:
requires:
- ripgrep
files:
- test.xml
commands:
- xmllint test.xml
# ensure (de)activation scripts for bash-on-win do not contain crlf line endings;
# ripgrep will return exit code 1 if no match is found, which is what we want after
# filtering to the carriage-return character that shouldn't be there.
{% for task in ["activate", "deactivate"] %}
- type %CONDA_PREFIX%\etc\conda\{{ task }}.d\libxml2_{{ task }}.sh | rg \r & if %ERRORLEVEL% NEQ 1 (exit 0) else (exit 1) # [win]
{% endfor %}

about:
home: http://xmlsoft.org/
Expand Down

0 comments on commit a1f7bd6

Please sign in to comment.