diff --git a/.ci/Dockerfile b/.ci/Dockerfile index c6c043de..9b9034df 100644 --- a/.ci/Dockerfile +++ b/.ci/Dockerfile @@ -27,7 +27,3 @@ COPY install-sys-pkgs.sh . # jq and iproute2 are used to find the interface IPv4 address RUN apt-get update && apt-get -y --no-install-recommends install libpython3-dev python3-venv jq iproute2 RUN ./install-sys-pkgs.sh - -RUN python3 -m venv /venv -RUN chown -R +1000:+1000 /venv -ENV PATH=/venv/bin:$PATH diff --git a/.ci/install-sys-pkgs.sh b/.ci/install-sys-pkgs.sh index 5c37b868..3077d4ca 100755 --- a/.ci/install-sys-pkgs.sh +++ b/.ci/install-sys-pkgs.sh @@ -1,10 +1,6 @@ #!/bin/bash set -e -# Create this just for consistency with the MacOS native file -mkdir -p $HOME/.local/share/meson/native -touch $HOME/.local/share/meson/native/ci.ini - if [ "$(uname -s)" = "Linux" ]; then SUDO=sudo if [ `id -u` -eq 0 ]; then @@ -31,6 +27,7 @@ else # On Apple Silicon, homebrew is installed in /opt/homebrew, but the # toolchains are not configured to find things there. prefix="$(brew --prefix)" + mkdir -p $HOME/.local/share/meson/native cat > $HOME/.local/share/meson/native/ci.ini <