diff --git a/.drone.yml b/.drone.yml index de0ac82..49ee42e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,6 +2,9 @@ kind: pipeline type: docker name: linux_amd64 +environment: + CONAN_REVISIONS_ENABLED: "1" + platform: os: linux arch: amd64 @@ -39,18 +42,6 @@ steps: commands: - docker images - - name: setup_conan - image: ubuntu_amd64:latest - volumes: - - name: py - path: /opt/venv/ - pull: if-not-exists - environment: - CONAN_REVISIONS_ENABLED: "1" - commands: - - . /opt/venv/bin/activate - - pip install conan==2.5.0 - - name: echo_info image: ubuntu_amd64:latest pull: if-not-exists @@ -75,6 +66,7 @@ steps: - name: py path: /opt/venv/ commands: + - . /opt/venv/bin/activate - rm -rvf ./build - export CC=$(which gcc) - export CXX=$(which g++) @@ -93,6 +85,7 @@ steps: - name: py path: /opt/venv/ commands: + - . /opt/venv/bin/activate - rm -rvf ./build - export CC=$(which clang) - export CXX=$(which clang++) diff --git a/tools/docker/linux_amd64 b/tools/docker/linux_amd64 index e3d206e..7cbf38b 100644 --- a/tools/docker/linux_amd64 +++ b/tools/docker/linux_amd64 @@ -13,3 +13,5 @@ RUN apt-get install -y \ python3.12-venv RUN python3 -m venv /opt/venv +RUN . /opt/venv/bin/activate +RUN pip install conan==2.5.0