diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-09-03 21:18:26 +0200 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-09-04 17:03:24 +0200 |
| commit | d5f30308b44f2609865a6ba3993de091f6643e72 (patch) | |
| tree | acbe727a45fb961e2933ec8ba9dbb51b81de0ccb | |
| parent | cab77b0e4c767e8f6d09473c4829ae204e3628db (diff) | |
| download | meson-d5f30308b44f2609865a6ba3993de091f6643e72.zip meson-d5f30308b44f2609865a6ba3993de091f6643e72.tar.gz meson-d5f30308b44f2609865a6ba3993de091f6643e72.tar.bz2 | |
ci: Fix missing MESON_CI_JOBNAME in the image builders
| -rw-r--r-- | .github/workflows/os_comp.yml | 3 | ||||
| -rw-r--r-- | ci/ciimage/arch/image.json | 3 | ||||
| -rw-r--r-- | ci/ciimage/bionic/image.json | 3 | ||||
| -rw-r--r-- | ci/ciimage/cuda/image.json | 5 | ||||
| -rw-r--r-- | ci/ciimage/fedora/image.json | 3 | ||||
| -rw-r--r-- | ci/ciimage/opensuse/image.json | 3 | ||||
| -rw-r--r-- | ci/ciimage/ubuntu-rolling/image.json | 3 |
7 files changed, 16 insertions, 7 deletions
diff --git a/.github/workflows/os_comp.yml b/.github/workflows/os_comp.yml index 6d4ed7a..3f8e8bc 100644 --- a/.github/workflows/os_comp.yml +++ b/.github/workflows/os_comp.yml @@ -87,7 +87,7 @@ jobs: CXX: 'g++' env: - MESON_CI_JOBNAME: linux-${{ github.job }}-${{ matrix.cfg.CC }} + MESON_CI_JOBNAME_UPDATE: linux-${{ github.job }}-${{ matrix.cfg.CC }} container: image: mesonbuild/ubuntu-rolling @@ -118,6 +118,7 @@ jobs: fi source /ci/env_vars.sh + export MESON_CI_JOBNAME=$MESON_CI_JOBNAME_UPDATE update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix diff --git a/ci/ciimage/arch/image.json b/ci/ciimage/arch/image.json index 5254073..4a399d6 100644 --- a/ci/ciimage/arch/image.json +++ b/ci/ciimage/arch/image.json @@ -1,6 +1,7 @@ { "base_image": "archlinux:latest", "env": { - "CI": "1" + "CI": "1", + "MESON_CI_JOBNAME": "linux-arch-gcc" } } diff --git a/ci/ciimage/bionic/image.json b/ci/ciimage/bionic/image.json index d400902..5df709e 100644 --- a/ci/ciimage/bionic/image.json +++ b/ci/ciimage/bionic/image.json @@ -2,6 +2,7 @@ "base_image": "ubuntu:bionic", "env": { "CI": "1", - "DC": "gdc" + "DC": "gdc", + "MESON_CI_JOBNAME": "linux-bionic-gcc" } } diff --git a/ci/ciimage/cuda/image.json b/ci/ciimage/cuda/image.json index d395e71..f422723 100644 --- a/ci/ciimage/cuda/image.json +++ b/ci/ciimage/cuda/image.json @@ -1,5 +1,8 @@ { "base_image": "archlinux:latest", "args": ["--only", "cuda"], - "env": {} + "env": { + "CI": "1", + "MESON_CI_JOBNAME": "linux-cuda-gcc" + } } diff --git a/ci/ciimage/fedora/image.json b/ci/ciimage/fedora/image.json index ee96980..c6fdc9e 100644 --- a/ci/ciimage/fedora/image.json +++ b/ci/ciimage/fedora/image.json @@ -2,6 +2,7 @@ "base_image": "fedora:latest", "env": { "CI": "1", - "SKIP_STATIC_BOOST": "1" + "SKIP_STATIC_BOOST": "1", + "MESON_CI_JOBNAME": "linux-fedora-gcc" } } diff --git a/ci/ciimage/opensuse/image.json b/ci/ciimage/opensuse/image.json index a5e6d1a..6609aa0 100644 --- a/ci/ciimage/opensuse/image.json +++ b/ci/ciimage/opensuse/image.json @@ -3,6 +3,7 @@ "env": { "CI": "1", "SKIP_STATIC_BOOST": "1", - "SINGLE_DUB_COMPILER": "1" + "SINGLE_DUB_COMPILER": "1", + "MESON_CI_JOBNAME": "linux-opensuse-gcc" } } diff --git a/ci/ciimage/ubuntu-rolling/image.json b/ci/ciimage/ubuntu-rolling/image.json index 038b945..f9f068d 100644 --- a/ci/ciimage/ubuntu-rolling/image.json +++ b/ci/ciimage/ubuntu-rolling/image.json @@ -2,6 +2,7 @@ "base_image": "ubuntu:rolling", "env": { "CI": "1", - "DC": "gdc" + "DC": "gdc", + "MESON_CI_JOBNAME": "linux-ubuntu-rolling-gcc" } } |