diff --git a/.github/workflows/build-linux-arm64.yml b/.github/workflows/build-linux-arm64.yml index 070d2a8e1..ad92e7884 100644 --- a/.github/workflows/build-linux-arm64.yml +++ b/.github/workflows/build-linux-arm64.yml @@ -27,6 +27,8 @@ jobs: push: true tags: localhost:5000/virgil-crypto-c-arm64:latest - - name: Inspect + - name: Copy artifacts run: | - docker buildx imagetools inspect localhost:5000/virgil-crypto-c-arm64:latest + DOCKER_CONTAINER_NAME=$(docker container list -l | grep virgil-crypto-c-arm64 | awk 'NF>1{print $NF}') + docker cp $DOCKER_CONTAINER_NAME:/home/build-dir/install ./install + ls -l install diff --git a/CMakeLists.txt b/CMakeLists.txt index 79ee1d3dc..e32af9594 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -171,10 +171,10 @@ include(GNUInstallDirs) if (NOT DEFINED ENV{VIRTUAL_ENV}) message(STATUS "Create python virtual environment...") set(ENV{VIRTUAL_ENV} "${CMAKE_CURRENT_BINARY_DIR}/.venv") - set(ENV{PATH} "$ENV{VIRTUAL_ENV}/bin:$ENV{PATH}") execute_process(COMMAND python3 -m venv "$ENV{VIRTUAL_ENV}") endif() +set(ENV{PATH} "$ENV{VIRTUAL_ENV}/bin:$ENV{PATH}") execute_process(COMMAND pip3 install -U -r "${CMAKE_CURRENT_SOURCE_DIR}/requirements.txt") # --------------------------------------------------------------------------- diff --git a/Dockerfile b/Dockerfile index 89ea3b8ee..bb5f409ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ RUN apt-get install -y build-essential cmake git python3 python3-pip python3-ven WORKDIR /home/build-dir COPY . . -RUN cmake -S . -B build +RUN cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/home/build-dir/install RUN cmake --build build -j10 WORKDIR /home/build-dir/build RUN ctest --output-on-failure