From a91cf18d09847d7fea609202c855f4d62c9224f7 Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Wed, 9 Dec 2020 21:30:31 -0500 Subject: [PATCH] CI: coverage action parallelism --- .github/actions/coverage-build/action.yml | 31 ------- .github/workflows/coverage.yml | 101 +++++++++++++++++++--- 2 files changed, 91 insertions(+), 41 deletions(-) delete mode 100644 .github/actions/coverage-build/action.yml diff --git a/.github/actions/coverage-build/action.yml b/.github/actions/coverage-build/action.yml deleted file mode 100644 index cbb2d6321..000000000 --- a/.github/actions/coverage-build/action.yml +++ /dev/null @@ -1,31 +0,0 @@ -# DESCRIPTION: Github actions config -# SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0 - -name: coverage-build-action -description: "Common steps needed for coverage build jobs" - -runs: - using: "composite" - steps: - - name: Cache - uses: actions/cache@v2 - env: - cache-name: ccache - with: - path: ${{ github.workspace }}/.ccache - key: coverage-${{ env.cache-name }}-${{ github.sha }} - restore-keys: | - coverage-${{ env.cache-name }} - - - name: Install and build - env: - CI_BUILD_STAGE_NAME: build - run: | - bash ci/ci-install.bash - mkdir -p $CCACHE_DIR && bash ci/ci-ccache-maint.bash - bash ci/ci-script.bash - - - name: Install packages for tests - env: - CI_BUILD_STAGE_NAME: test - run: bash ci/ci-install.bash diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index d5e019bfe..4f07f0945 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -24,14 +24,31 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - - uses: ./.github/actions/coverage-build + - uses: actions/cache@v2 + env: + cache-name: ccache + with: + path: ${{ github.workspace }}/.ccache + key: coverage-${{ env.cache-name }}-${{ github.sha }} + restore-keys: | + coverage-${{ env.cache-name }} + - run: bash CI_BUILD_STAGE_NAME=build ci/ci-install-build.bash + test-dist: needs: buildjob runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - - uses: ./.github/actions/coverage-build + - uses: actions/cache@v2 + env: + cache-name: ccache + with: + path: ${{ github.workspace }}/.ccache + key: coverage-${{ env.cache-name }}-${{ github.sha }} + restore-keys: | + coverage-${{ env.cache-name }} + - run: bash CI_BUILD_STAGE_NAME=build ci/ci-install-build.bash - run: bash TESTS=coverage-dist ci/ci-script.bash test-vlt-0: @@ -39,7 +56,15 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - - uses: ./.github/actions/coverage-build + - uses: actions/cache@v2 + env: + cache-name: ccache + with: + path: ${{ github.workspace }}/.ccache + key: coverage-${{ env.cache-name }}-${{ github.sha }} + restore-keys: | + coverage-${{ env.cache-name }} + - run: bash CI_BUILD_STAGE_NAME=build ci/ci-install-build.bash - run: bash TESTS=coverage-vlt-0 ci/ci-script.bash test-vlt-1: @@ -47,7 +72,15 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - - uses: ./.github/actions/coverage-build + - uses: actions/cache@v2 + env: + cache-name: ccache + with: + path: ${{ github.workspace }}/.ccache + key: coverage-${{ env.cache-name }}-${{ github.sha }} + restore-keys: | + coverage-${{ env.cache-name }} + - run: bash CI_BUILD_STAGE_NAME=build ci/ci-install-build.bash - run: bash TESTS=coverage-vlt-1 ci/ci-script.bash test-vlt-2: @@ -55,7 +88,15 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - - uses: ./.github/actions/coverage-build + - uses: actions/cache@v2 + env: + cache-name: ccache + with: + path: ${{ github.workspace }}/.ccache + key: coverage-${{ env.cache-name }}-${{ github.sha }} + restore-keys: | + coverage-${{ env.cache-name }} + - run: bash CI_BUILD_STAGE_NAME=build ci/ci-install-build.bash - run: bash TESTS=coverage-vlt-2 ci/ci-script.bash test-vlt-3: @@ -63,7 +104,15 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - - uses: ./.github/actions/coverage-build + - uses: actions/cache@v2 + env: + cache-name: ccache + with: + path: ${{ github.workspace }}/.ccache + key: coverage-${{ env.cache-name }}-${{ github.sha }} + restore-keys: | + coverage-${{ env.cache-name }} + - run: bash CI_BUILD_STAGE_NAME=build ci/ci-install-build.bash - run: bash TESTS=coverage-vlt-3 ci/ci-script.bash test-vltmt-0: @@ -71,7 +120,15 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - - uses: ./.github/actions/coverage-build + - uses: actions/cache@v2 + env: + cache-name: ccache + with: + path: ${{ github.workspace }}/.ccache + key: coverage-${{ env.cache-name }}-${{ github.sha }} + restore-keys: | + coverage-${{ env.cache-name }} + - run: bash CI_BUILD_STAGE_NAME=build ci/ci-install-build.bash - run: bash TESTS=coverage-vltmt-0 ci/ci-script.bash test-vltmt-1: @@ -79,7 +136,15 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - - uses: ./.github/actions/coverage-build + - uses: actions/cache@v2 + env: + cache-name: ccache + with: + path: ${{ github.workspace }}/.ccache + key: coverage-${{ env.cache-name }}-${{ github.sha }} + restore-keys: | + coverage-${{ env.cache-name }} + - run: bash CI_BUILD_STAGE_NAME=build ci/ci-install-build.bash - run: bash TESTS=coverage-vltmt-1 ci/ci-script.bash test-vltmt-2: @@ -87,7 +152,15 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - - uses: ./.github/actions/coverage-build + - uses: actions/cache@v2 + env: + cache-name: ccache + with: + path: ${{ github.workspace }}/.ccache + key: coverage-${{ env.cache-name }}-${{ github.sha }} + restore-keys: | + coverage-${{ env.cache-name }} + - run: bash CI_BUILD_STAGE_NAME=build ci/ci-install-build.bash - run: bash TESTS=coverage-vltmt-2 ci/ci-script.bash test-vltmt-3: @@ -95,5 +168,13 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - - uses: ./.github/actions/coverage-build + - uses: actions/cache@v2 + env: + cache-name: ccache + with: + path: ${{ github.workspace }}/.ccache + key: coverage-${{ env.cache-name }}-${{ github.sha }} + restore-keys: | + coverage-${{ env.cache-name }} + - run: bash CI_BUILD_STAGE_NAME=build ci/ci-install-build.bash - run: bash TESTS=coverage-vltmt-3 ci/ci-script.bash