Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[3.7] Build against libxcrypt on Linux #676

Open
wants to merge 11 commits into
base: 3.7
Choose a base branch
from
Open

[3.7] Build against libxcrypt on Linux #676

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b4242a7
MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and co…
AaronOpfer Feb 15, 2024
341c228
build against libxcrypt on Linux
AaronOpfer Feb 15, 2024
df779cd
MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and co…
AaronOpfer Feb 15, 2024
e014c87
MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and co…
AaronOpfer Feb 15, 2024
181879d
restore .ci_support from 3.7
AaronOpfer Feb 20, 2024
9b260ac
hack up .azure-pipelines to revive openssl1.1.1
AaronOpfer Feb 20, 2024
ddafb80
fix both linux_64 configs having the same name
AaronOpfer Feb 20, 2024
9fa57fa
fix azure-pipelines windows using wrong cfg file
AaronOpfer Feb 20, 2024
ab1f401
not to be left out, hack up .travis.yml too
AaronOpfer Feb 20, 2024
6c70e6a
fix typo
AaronOpfer Feb 21, 2024
a45a91e
Use a cbc for pinning to older builds
isuruf Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

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

9 changes: 5 additions & 4 deletions .azure-pipelines/azure-pipelines-osx.yml
View file
Open in desktop

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

8 changes: 4 additions & 4 deletions .azure-pipelines/azure-pipelines-win.yml
View file
Open in desktop

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

7 changes: 6 additions & 1 deletion .ci_support/README
View file
Open in desktop

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

20 changes: 1 addition & 19 deletions .ci_support/linux_64_openssl1.1.1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,33 +15,17 @@ cxx_compiler:
cxx_compiler_version:
- '9'
docker_image:
- quay.io/condaforge/linux-anvil-comp7
- quay.io/condaforge/linux-anvil-cos7-x86_64
libffi:
- '3.4'
ncurses:
- '6.2'
openssl:
- 1.1.1
pin_run_as_build:
bzip2:
max_pin: x
libffi:
max_pin: x.x
ncurses:
max_pin: x.x
python:
min_pin: x.x
max_pin: x.x
readline:
max_pin: x
sqlite:
max_pin: x
tk:
max_pin: x.x
xz:
max_pin: x.x
zlib:
max_pin: x.x
python:
- '3.7'
readline:
Expand All @@ -57,7 +41,5 @@ xz:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - cdt_name
- docker_image
zlib:
- '1.2'
20 changes: 1 addition & 19 deletions .ci_support/linux_64_openssl3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,33 +15,17 @@ cxx_compiler:
cxx_compiler_version:
- '9'
docker_image:
- quay.io/condaforge/linux-anvil-comp7
- quay.io/condaforge/linux-anvil-cos7-x86_64
libffi:
- '3.4'
ncurses:
- '6.2'
openssl:
- '3'
pin_run_as_build:
bzip2:
max_pin: x
libffi:
max_pin: x.x
ncurses:
max_pin: x.x
python:
min_pin: x.x
max_pin: x.x
readline:
max_pin: x
sqlite:
max_pin: x
tk:
max_pin: x.x
xz:
max_pin: x.x
zlib:
max_pin: x.x
Comment on lines -26 to -44
Copy link
Member

Choose a reason for hiding this comment

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

Wouldn't we also need to match the pins for previous pin_run_as_build packages to "period-appropriate" versions in the local CBC?

python:
- '3.7'
readline:
Expand All @@ -57,7 +41,5 @@ xz:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - cdt_name
- docker_image
zlib:
- '1.2'
16 changes: 0 additions & 16 deletions .ci_support/linux_aarch64_openssl1.1.1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,9 @@ ncurses:
openssl:
- 1.1.1
pin_run_as_build:
bzip2:
max_pin: x
libffi:
max_pin: x.x
ncurses:
max_pin: x.x
python:
min_pin: x.x
max_pin: x.x
readline:
max_pin: x
sqlite:
max_pin: x
tk:
max_pin: x.x
xz:
max_pin: x.x
zlib:
max_pin: x.x
python:
- '3.7'
readline:
Expand Down
16 changes: 0 additions & 16 deletions .ci_support/linux_aarch64_openssl3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,9 @@ ncurses:
openssl:
- '3'
pin_run_as_build:
bzip2:
max_pin: x
libffi:
max_pin: x.x
ncurses:
max_pin: x.x
python:
min_pin: x.x
max_pin: x.x
readline:
max_pin: x
sqlite:
max_pin: x
tk:
max_pin: x.x
xz:
max_pin: x.x
zlib:
max_pin: x.x
python:
- '3.7'
readline:
Expand Down
14 changes: 0 additions & 14 deletions .ci_support/linux_ppc64le_openssl1.1.1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,9 @@ ncurses:
openssl:
- 1.1.1
pin_run_as_build:
bzip2:
max_pin: x
libffi:
max_pin: x.x
ncurses:
max_pin: x.x
python:
min_pin: x.x
max_pin: x.x
readline:
max_pin: x
sqlite:
max_pin: x
xz:
max_pin: x.x
zlib:
max_pin: x.x
python:
- '3.7'
readline:
Expand Down
14 changes: 0 additions & 14 deletions .ci_support/linux_ppc64le_openssl3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,9 @@ ncurses:
openssl:
- '3'
pin_run_as_build:
bzip2:
max_pin: x
libffi:
max_pin: x.x
ncurses:
max_pin: x.x
python:
min_pin: x.x
max_pin: x.x
readline:
max_pin: x
sqlite:
max_pin: x
xz:
max_pin: x.x
zlib:
max_pin: x.x
python:
- '3.7'
readline:
Expand Down
7 changes: 0 additions & 7 deletions .ci_support/migrations/libffi34.yaml
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions .ci_support/migrations/openssl3.yaml
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions .ci_support/osx_64_openssl1.1.1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,9 @@ ncurses:
openssl:
- 1.1.1
pin_run_as_build:
bzip2:
max_pin: x
libffi:
max_pin: x.x
ncurses:
max_pin: x.x
python:
min_pin: x.x
max_pin: x.x
readline:
max_pin: x
sqlite:
max_pin: x
tk:
max_pin: x.x
xz:
max_pin: x.x
zlib:
max_pin: x.x
python:
- '3.7'
readline:
Expand Down
16 changes: 0 additions & 16 deletions .ci_support/osx_64_openssl3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,9 @@ ncurses:
openssl:
- '3'
pin_run_as_build:
bzip2:
max_pin: x
libffi:
max_pin: x.x
ncurses:
max_pin: x.x
python:
min_pin: x.x
max_pin: x.x
readline:
max_pin: x
sqlite:
max_pin: x
tk:
max_pin: x.x
xz:
max_pin: x.x
zlib:
max_pin: x.x
python:
- '3.7'
readline:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/win_64_openssl1.1.1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
sqlite:
max_pin: x
python:
- '3.7'
sqlite:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/win_64_openssl3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
sqlite:
max_pin: x
python:
- '3.7'
sqlite:
Expand Down
14 changes: 7 additions & 7 deletions .travis.yml
View file
Open in desktop

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

Loading