diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2021-06-21 14:06:45 +0100 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-07-07 20:08:12 +0200 |
| commit | 609864a66ddc6af559fadadd76a266d64ae9991e (patch) | |
| tree | 6c26994e54ebd407bb6ad5d48245573e5e70a262 /.github | |
| parent | 0cd8897189b3d68d500ffcd3f32e0f855ac04337 (diff) | |
| download | meson-609864a66ddc6af559fadadd76a266d64ae9991e.zip meson-609864a66ddc6af559fadadd76a266d64ae9991e.tar.gz meson-609864a66ddc6af559fadadd76a266d64ae9991e.tar.bz2 | |
Annotate framework tests with where they are expected to skip
Remove hard-coded framework test skip logic in skippable(), instead
annotate test.json with environments in which skip is expected.
(Mainly this is done with by testing the value of MESON_CI_JOBNAME now
set for linux jobs)
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/os_comp.yml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/.github/workflows/os_comp.yml b/.github/workflows/os_comp.yml index 6531e2b..dc5f368 100644 --- a/.github/workflows/os_comp.yml +++ b/.github/workflows/os_comp.yml @@ -1,4 +1,4 @@ -name: OS Comp Tests +name: linux on: push: @@ -34,6 +34,9 @@ jobs: - { name: OpenSUSE, id: opensuse } - { name: Ubuntu Bionic, id: bionic } container: mesonbuild/${{ matrix.cfg.id }}:latest + env: + MESON_CI_JOBNAME: linux-${{ matrix.cfg.id }}-gcc + steps: - uses: actions/checkout@v2 - name: Run tests @@ -77,6 +80,9 @@ jobs: CC: 'gcc' CXX: 'g++' + env: + MESON_CI_JOBNAME: linux-${{ github.job }}-${{ matrix.cfg.CC }} + container: image: mesonbuild/ubuntu-rolling env: |