File tree Expand file tree Collapse file tree 1 file changed +12
-2
lines changed Expand file tree Collapse file tree 1 file changed +12
-2
lines changed Original file line number Diff line number Diff line change @@ -100,8 +100,11 @@ backends:
100100 - self-hosted-linux-s390x-noble-edge :
101101 username : ubuntu
102102 environment :
103- # pkg-config needed to build cryptography to install poetry
104- CONCIERGE_EXTRA_DEBS : pipx,pkg-config
103+ # Several python packages (e.g. cryptography, bcrypt) do not have s390x builds on PyPI,
104+ # so they must be built from source. pkg-config & rust toolchain needed
105+ # (These packages are being built when installing poetry or integration test Python
106+ # dependencies)
107+ CONCIERGE_EXTRA_DEBS : pipx,pkg-config,rustup
105108 variants :
106109 - -juju29_ubuntu22
107110
@@ -127,6 +130,13 @@ prepare: |
127130 # Install charmcraft & pipx on lxd-vm backend and install pipx on IS-hosted runners
128131 ~/go/bin/concierge prepare --trace
129132
133+ if [[ $SPREAD_SYSTEM == *"s390x"* ]]
134+ then
135+ rustup set profile minimal
136+ # TODO add renovate comment for rust version
137+ rustup default 1.88.0
138+ fi
139+
130140 pipx install tox poetry
131141prepare-each : |
132142 cd "$SPREAD_PATH"
You can’t perform that action at this time.
0 commit comments