From b5481baf0241dd16228b20078053236faf355bcb Mon Sep 17 00:00:00 2001 From: innovaker <66737976+innovaker@users.noreply.github.com> Date: Thu, 10 Jun 2021 20:23:56 +0100 Subject: [PATCH] refactor(common): move `cmake --version` from Dockerfile to tests Makes it easier to check the `cmake` version against the Zephyr documentation, especially when the layer is already cached. PR: #71 --- .github/workflows/containers.yml | 2 ++ Dockerfile | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml index 374cd87..23caf94 100644 --- a/.github/workflows/containers.yml +++ b/.github/workflows/containers.yml @@ -341,6 +341,8 @@ jobs: - name: Create and run container from 'build' candidate image shell: bash run: docker run -d -it --name candidate ${{ env.docker-args }} ${{ steps.paths.outputs.build-candidate }} + - name: Test cmake + run: cmake --version - name: Test diff run: diff --version - name: Test west init diff --git a/Dockerfile b/Dockerfile index 8cd4a39..214d428 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,8 +32,7 @@ RUN \ python3-setuptools \ python3-wheel \ && apt-get clean \ - && rm -rf /var/lib/apt/lists/* \ - && cmake --version + && rm -rf /var/lib/apt/lists/* #------------------------------------------------------------------------------