CI: Fix coverage action (install systemc)

This commit is contained in:
Wilson Snyder 2021-01-10 19:45:43 -05:00
parent 6060acc73d
commit d4d9e12b66
2 changed files with 8 additions and 5 deletions

View File

@ -23,6 +23,8 @@ jobs:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
env: env:
CI_BUILD_STAGE_NAME: build CI_BUILD_STAGE_NAME: build
CI_RUNS_ON: ${{ matrix.os }}
CACHE_KEY: ${{ matrix.os }}-${{ matrix.compiler.cc }}-coverage
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -32,7 +34,7 @@ jobs:
cache-name: ccache cache-name: ccache
with: with:
path: ${{ github.workspace }}/.ccache path: ${{ github.workspace }}/.ccache
key: coverage-${{ env.cache-name }}-${{ github.sha }} key: ${{ env.CACHE_KEY }}-${{ env.cache-name }}-${{ github.sha }}
restore-keys: coverage-${{ env.cache-name }} restore-keys: coverage-${{ env.cache-name }}
- name: Install dependencies for build - name: Install dependencies for build
@ -70,6 +72,8 @@ jobs:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
env: env:
CI_BUILD_STAGE_NAME: test CI_BUILD_STAGE_NAME: test
CI_RUNS_ON: ${{ matrix.os }}
CACHE_KEY: ${{ matrix.os }}-${{ matrix.compiler.cc }}-coverage
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -79,7 +83,7 @@ jobs:
cache-name: ccache cache-name: ccache
with: with:
path: ${{ github.workspace }}/.ccache path: ${{ github.workspace }}/.ccache
key: coverage-${{ env.cache-name }}-${{ github.sha }} key: ${{ env.CACHE_KEY }}-${{ env.cache-name }}-${{ github.sha }}
restore-keys: coverage-${{ env.cache-name }} restore-keys: coverage-${{ env.cache-name }}
- uses: actions/download-artifact@v2 - uses: actions/download-artifact@v2

View File

@ -310,18 +310,17 @@ def source_globs(*dirs):
def run(command): def run(command):
# run a system command, check errors # run a system command, check errors
print("\t%s" % command) print("\t%s" % command)
os.system(command)
status = subprocess.call(command, shell=True) status = subprocess.call(command, shell=True)
if status < 0: if status < 0:
raise Exception("%Error: Command failed " + command + ", stopped") raise Exception("%Error: Command failed " + command + ", stopped")
def ci_fold_start(action): def ci_fold_start(action):
print("::group::" + action) print("::group::" + action, flush=True)
def ci_fold_end(): def ci_fold_end():
print("::endgroup::\n") print("::endgroup::\n", flush=True)
####################################################################### #######################################################################