ci: Fix missing MESON_CI_JOBNAME in the image builders

0.59
Daniel Mensinger 3 years ago committed by Nirbheek Chauhan
parent 13f2ad96cb
commit 723c7acc76
  1. 3
      .github/workflows/os_comp.yml
  2. 3
      ci/ciimage/arch/image.json
  3. 3
      ci/ciimage/bionic/image.json
  4. 5
      ci/ciimage/cuda/image.json
  5. 3
      ci/ciimage/fedora/image.json
  6. 3
      ci/ciimage/opensuse/image.json
  7. 3
      ci/ciimage/ubuntu-rolling/image.json

@ -85,7 +85,7 @@ jobs:
CXX: 'g++' CXX: 'g++'
env: env:
MESON_CI_JOBNAME: linux-${{ github.job }}-${{ matrix.cfg.CC }} MESON_CI_JOBNAME_UPDATE: linux-${{ github.job }}-${{ matrix.cfg.CC }}
container: container:
image: mesonbuild/ubuntu-rolling image: mesonbuild/ubuntu-rolling
@ -116,6 +116,7 @@ jobs:
fi fi
source /ci/env_vars.sh 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-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 update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix

@ -1,6 +1,7 @@
{ {
"base_image": "archlinux:latest", "base_image": "archlinux:latest",
"env": { "env": {
"CI": "1" "CI": "1",
"MESON_CI_JOBNAME": "linux-arch-gcc"
} }
} }

@ -2,6 +2,7 @@
"base_image": "ubuntu:bionic", "base_image": "ubuntu:bionic",
"env": { "env": {
"CI": "1", "CI": "1",
"DC": "gdc" "DC": "gdc",
"MESON_CI_JOBNAME": "linux-bionic-gcc"
} }
} }

@ -1,5 +1,8 @@
{ {
"base_image": "archlinux:latest", "base_image": "archlinux:latest",
"args": ["--only", "cuda"], "args": ["--only", "cuda"],
"env": {} "env": {
"CI": "1",
"MESON_CI_JOBNAME": "linux-cuda-gcc"
}
} }

@ -2,6 +2,7 @@
"base_image": "fedora:latest", "base_image": "fedora:latest",
"env": { "env": {
"CI": "1", "CI": "1",
"SKIP_STATIC_BOOST": "1" "SKIP_STATIC_BOOST": "1",
"MESON_CI_JOBNAME": "linux-fedora-gcc"
} }
} }

@ -3,6 +3,7 @@
"env": { "env": {
"CI": "1", "CI": "1",
"SKIP_STATIC_BOOST": "1", "SKIP_STATIC_BOOST": "1",
"SINGLE_DUB_COMPILER": "1" "SINGLE_DUB_COMPILER": "1",
"MESON_CI_JOBNAME": "linux-opensuse-gcc"
} }
} }

@ -2,6 +2,7 @@
"base_image": "ubuntu:rolling", "base_image": "ubuntu:rolling",
"env": { "env": {
"CI": "1", "CI": "1",
"DC": "gdc" "DC": "gdc",
"MESON_CI_JOBNAME": "linux-ubuntu-rolling-gcc"
} }
} }

Loading…
Cancel
Save