Skip to content

Commit ec2ad1a

Browse files
authored
Fix cross-arch CI tests (frequenz-floss#1141)
We only need to do this when the cache directory exists, otherwise the step fails with an error. Also install `python-venv` instead of `python-distutils`, as the `distutils` package was removed in Python 3.12 (and deadsnakes).
2 parents 1f839e4 + a61c568 commit ec2ad1a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/containers/nox-cross-arch/arm64-ubuntu-20.04-python.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN apt-get update -y && \
1919
curl \
2020
git \
2121
python${PYTHON_VERSION} \
22-
python${PYTHON_VERSION}-distutils && \
22+
python${PYTHON_VERSION}-venv && \
2323
apt-get clean && \
2424
rm -rf /var/lib/apt/lists/*
2525

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ jobs:
198198
# This ensures that the runner has access to the pip cache.
199199
- name: Reset pip cache ownership
200200
if: always()
201-
run: sudo chown -R $USER:$USER /tmp/pip-cache
201+
run: if [[ -e /tmp/pip-cache ]]; then sudo chown -R $USER:$USER /tmp/pip-cache; fi
202202

203203
# This job runs if all the `nox-cross-arch` matrix jobs ran and succeeded.
204204
# As the `nox-all` job, its main purpose is to provide a single point of

0 commit comments

Comments
 (0)