From 2bc25a33698eef325509aa096bb0b5b2291df64c Mon Sep 17 00:00:00 2001 From: Duncan Overbruck Date: Sat, 18 Apr 2020 15:17:10 +0200 Subject: [PATCH] .github/workflows/coverity-scan.yml: simplify --- .github/workflows/coverity-scan.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml index a37a3e92..c89a72ee 100644 --- a/.github/workflows/coverity-scan.yml +++ b/.github/workflows/coverity-scan.yml @@ -12,9 +12,6 @@ jobs: - name: Setup container run: | - docker pull voidlinux/voidlinux - docker run -v "$PWD":/tmp/build-dir -w "/tmp/build-dir" voidlinux/voidlinux \ - /bin/sh -c "xbps-install -Syu xbps && xbps-install -yu && xbps-install -y tar gcc make pkgconf kyua zlib-devel libarchive-devel atf-devel" - name: Checkout void-linux/xbps run: | @@ -28,15 +25,14 @@ jobs: env: TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }} - - name: Configure + - name: Configure and build in voidlinux/voilinux container run: | + docker pull voidlinux/voidlinux docker run -v "$PWD":/tmp/build-dir -w "/tmp/build-dir" voidlinux/voidlinux \ - /bin/sh -c "CC=gcc ./configure --enable-tests" - - - name: Build with cov-build - run: | - docker run -v "$PWD":/tmp/build-dir -w "/tmp/build-dir" voidlinux/voidlinux \ - /bin/sh -c "PATH=\$(pwd)/cov-analysis-linux64/bin:\$PATH cov-build --dir cov-int make -j$(nproc)" + /bin/sh -c "xbps-install -Syu xbps && xbps-install -yu && + xbps-install -y gcc make pkgconf kyua zlib-devel libarchive-devel atf-devel && + CC=gcc ./configure && + PATH=/tmp/build-dir/cov-analysis-linux64/bin:\$PATH cov-build --dir cov-int make -j\$(nproc)" - name: Submit the result to Coverity Scan run: |