diff options
| author | Erik Faye-Lund <erik.faye-lund@collabora.com> | 2023-02-17 14:13:38 +0100 |
|---|---|---|
| committer | Erik Faye-Lund <erik.faye-lund@collabora.com> | 2023-02-20 07:24:21 +0000 |
| commit | fd24cdfe75b0c17f1ab61421536ba4447ac62c1a (patch) | |
| tree | 39754f9bd725fb86c7800f796976ab16128033d4 | |
| parent | 3d73c8c4f6ff9bb295e09bbbf1d220185ecb9e13 (diff) | |
| download | mesa-demos-fd24cdfe75b0c17f1ab61421536ba4447ac62c1a.tar.gz | |
ci: build using clang
This should ensure that mesa-demos builds on systems that use clang
instead of GCC by default. It also might increase the chance of building
on other compilers as well.
While we're at it, rename the "build" to "build-gcc".
Reviewed-by: Hoe Hao Cheng <haochengho12907@gmail.com>
| -rw-r--r-- | .gitlab-ci.yml | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 88f8ca36..b6c81d70 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,9 +35,10 @@ x86_build: # No need to pull the whole repo to build the container image GIT_STRATEGY: none # /!\ Bump the TAG when modifying the DEBS - FDO_DISTRIBUTION_TAG: &x86_build "2023-02-03-libdecor-1" + FDO_DISTRIBUTION_TAG: &x86_build "2023-02-17-clang" FDO_DISTRIBUTION_PACKAGES: >- build-essential + clang python3-pip pkg-config ninja-build @@ -93,7 +94,7 @@ x86_build: - ninja -C _build -j${FDO_CI_CONCURRENT:-4} - ninja -C _build install -build: +.build-linux: extends: - .use-x86_build - .build @@ -103,6 +104,17 @@ build: -Dlibdecor-0:gtk=disabled -Dlibdecor-0:demo=false +build-gcc: + extends: + - .build-linux + +build-clang: + extends: + - .build-linux + variables: + CC: clang + CXX: clang++ + build-mingw: extends: - .use-x86_build |