]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
use python venv for debian
authorMaria Matejka <mq@ucw.cz>
Mon, 13 Jan 2025 21:21:43 +0000 (22:21 +0100)
committerMaria Matejka <mq@ucw.cz>
Tue, 1 Apr 2025 10:09:36 +0000 (12:09 +0200)
.gitlab-ci.yml
misc/docker/debian-12-amd64/Dockerfile
misc/docker/debian-12-i386/Dockerfile
misc/docker/ubuntu-22.04-amd64/Dockerfile
misc/docker/ubuntu-24.04-amd64/Dockerfile
misc/docker/ubuntu-24.10-amd64/Dockerfile

index 27b35fb3da8e8f369baf93601644b03b8e43b765..9efd796866d220229e208f660747709a53b4c471 100644 (file)
@@ -450,6 +450,8 @@ build-only-static:
 .pkg-deb: &pkg-deb
   stage: pkg
   script:
+    # create venv only if it's installed
+    - if python3 -m venv venv; then . venv/bin/activate; fi
     - pip3 install apkg
     - BRANCH=$CI_COMMIT_BRANCH ARCHIVE_DOCS=false apkg build
     #- apkg install -y pkg/pkgs/*/*/*.deb
index 3c6b43dd6e757a46a80e0e340b67a126b2b9fb09..9a3ab9f43aa41d98011baf35bc3a6665d6735250 100644 (file)
@@ -23,4 +23,5 @@ RUN apt-get -y --no-install-recommends install \
        quilt \
        python3 \
        python3-pip \
-       python3-setuptools
+       python3-setuptools \
+       python3-venv
index 414178f128320b0b35be1fc5d0e03ac6cefdb35f..a324f9efa0a2771f7cb61ac1b2b4a40a76a90d88 100644 (file)
@@ -22,4 +22,5 @@ RUN apt-get -y --no-install-recommends install \
        quilt \
        python3 \
        python3-pip \
-       python3-setuptools
+       python3-setuptools \
+       python3-venv
index 00c4ffec41a4c36e66b77499bfe81ca83a33b63a..4996fff2a12f916146eae687825d56e9a1347c12 100644 (file)
@@ -24,4 +24,5 @@ RUN apt-get -y install \
        quilt \
        python3 \
        python3-pip \
-       python3-setuptools
+       python3-setuptools \
+       python3-venv
index b6567eb25365715c2c07bfe40f9baeb88d5267e2..7997700151d377e43b998e1e2d10a286823daa56 100644 (file)
@@ -24,4 +24,5 @@ RUN apt-get -y install \
        quilt \
        python3 \
        python3-pip \
-       python3-setuptools
+       python3-setuptools \
+       python3-venv
index b886ec63845908152336217e874fec7b6e0a976e..03a3821b1d84037dcf8b8b110b2bc41abedcf497 100644 (file)
@@ -24,4 +24,5 @@ RUN apt-get -y install \
        quilt \
        python3 \
        python3-pip \
-       python3-setuptools
+       python3-setuptools \
+       python3-venv