gitlab-ci: merge several meson jobs
authorEric Engestrom <eric.engestrom@intel.com>
Fri, 8 Mar 2019 16:33:07 +0000 (16:33 +0000)
committerEric Anholt <eric@anholt.net>
Thu, 2 May 2019 20:39:12 +0000 (20:39 +0000)
commit41407c602c7369a8babb08ac63fe9923c7746002
treedef04bccba34c66dfed8aeaaaaa7d7d246f8b64c
parent9b80322532ef62e9995863af2853107458048628
gitlab-ci: merge several meson jobs

Merge the following into `meson-main`/`meson-loader-classic-dri`/
`meson-gallium-swr`:
- meson-vulkan
- meson-gallium-drivers-other
- meson-gallium-st-other

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
[ Michel Dänzer ]
* Rebase and fix up commit log.
* Don't set VULKAN_DRIVERS in meson-loader-classic-dri.
* Remove extraneous whitespace.
* Squash in follow-up fixes.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
[ anholt]
* Add a note why nine and swrast landed where they did.
* Switch from s/meson-vulkan/meson-main/ to
  s/meson-loader-classic-dri/meson-main/ which I think was the original
  intent

Reviewed-by: Eric Anholt <eric@anholt.net>
Acked-by: Eric Engestrom <eric.engestrom@intel.com> (anholt changes)
Acked-by: Dylan Baker <dylan@pnwbakers.com>
.gitlab-ci.yml