diff options
| -rw-r--r-- | .gitlab-ci.yml | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 074c23d..edbb843 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ # Please see the ci-templates documentation for details: # https://freedesktop.pages.freedesktop.org/ci-templates/ -.templates_sha: &template_sha 34f4ade99434043f88e164933f570301fd18b125 # see https://docs.gitlab.com/ee/ci/yaml/#includefile +.templates_sha: &template_sha 25e8e9f020880aa35fffe3d6b259b933f0f9449f # see https://docs.gitlab.com/ee/ci/yaml/#includefile include: @@ -30,8 +30,8 @@ variables: # The tag should be updated each time the list of packages is updated. # Changing a tag forces the associated image to be rebuilt. # Note: the tag has no meaning, we use a date format purely for readability - FDO_DISTRIBUTION_TAG: '2023-06-21' - FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake libtool make xorg-util-macros xorgproto meson ninja jq' + FDO_DISTRIBUTION_TAG: '2023-09-16' + FDO_DISTRIBUTION_PACKAGES: 'git gcc clang pkgconf autoconf automake libtool make xorg-util-macros xorgproto meson ninja jq' # @@ -104,16 +104,25 @@ autotools: # # The meson build, runs on the image built above. # -meson: +.meson_build: stage: build extends: - .fdo.distribution-image@arch script: - - meson setup _builddir --prefix="$PWD/_install" + - CC="${CC}" meson setup _builddir --prefix="$PWD/_install" - meson configure _builddir - ninja -C _builddir test - ninja -C _builddir install +# Run meson build with different compilers +meson: + extends: + - .meson_build + parallel: + matrix: + - CC: ["gcc", "clang"] + + meson from tarball: extends: - .fdo.distribution-image@arch |