Skip to content

Commit

Permalink
Set MESON_CI_JOBNAME for all CI jobs
Browse files Browse the repository at this point in the history
Set MESON_CI_JOBNAME for all CI jobs which run project tests.

(Note that ${{ github.job }} is the literal job.id used in the yaml, not
any name given to the job with job.id.name, and so is the same for all
matrix entries, and thus not suitable for our purposes there).
  • Loading branch information
jon-turney committed Jul 13, 2021
1 parent a10b0c9 commit 24135c8
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .github/workflows/cygwin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ jobs:
include:
- NAME: gccx64ninja
ARCH: x86_64
env:
MESON_CI_JOBNAME: cygwin-${{ matrix.NAME }}

steps:
# cache should be saved on failure, but the action doesn't support that
Expand Down
12 changes: 11 additions & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,18 @@ jobs:
project-tests-appleclang:
runs-on: macos-latest
strategy:
fail-fast: false
matrix:
unity: ["on", "off"]
include:
- NAME: macos-clang
unity: off
- NAME: macos-clang-unity
unity: on

name: ${{ matrix.NAME }}
env:
MESON_CI_JOBNAME: ${{ matrix.NAME }}

steps:
- uses: actions/checkout@v2
# use python3 from homebrew because it is a valid framework, unlike the actions one:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/msys2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ jobs:
MSYS2_CURSES:
COMPILER: clang
TOOLCHAIN: clang
env:
MESON_CI_JOBNAME: msys2-${{ matrix.NAME }}

defaults:
run:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/nonative.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ jobs:
cross-only-armhf:
runs-on: ubuntu-latest
container: mesonbuild/eoan:latest
env:
MESON_CI_JOBNAME: ubuntu-${{ github.job }}

steps:
- run: |
apt-get -y purge clang gcc gdc
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/unusedargs_missingreturn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ jobs:
sudo apt install -yq --no-install-recommends g++ gfortran ninja-build gobjc gobjc++
python -m pip install coverage codecov
- run: ./tools/run_with_cov.py run_project_tests.py --only cmake common fortran platform-linux "objective c" "objective c++"
env:
MESON_CI_JOBNAME: linux-ubuntu-gcc-werror
- name: Upload coverage report
run: ./ci/upload_cov.sh "UnusedMissingReturn"

Expand All @@ -65,6 +67,7 @@ jobs:
CC: gcc
CXX: g++
FC: gfortran
MESON_CI_JOBNAME: msys2-gcc-werror

- name: Upload coverage report
run: ./ci/upload_cov.sh "UnusedMissingReturn Windows"
2 changes: 2 additions & 0 deletions ci/azure-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ steps:
inputs:
targetType: 'filePath'
filePath: .\ci\run.ps1
env:
MESON_CI_JOBNAME: azure-$(System.JobName)

- task: PublishTestResults@2
inputs:
Expand Down

0 comments on commit 24135c8

Please sign in to comment.