diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-02-24 17:01:21 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-02-24 17:01:21 -0800 |
| commit | 8df03a7aa524b4b5fea47786726a278498974572 (patch) | |
| tree | e19ac6b5396210ab2308d04f4f808ce700c608e5 /.gitlab-ci.yml | |
| parent | 4d7a9a61f76b75bc0cce0a7d531cd471621cde27 (diff) | |
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00ad0ee..746c8d5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ variables: include: - project: 'freedesktop/ci-templates' - ref: 59de540b620c45739871d1a073d76d5521989d11 + ref: 9568e38927f9e9c48d4f586f84a071c3a4bdcd39 file: '/templates/debian.yml' - template: Security/SAST.gitlab-ci.yml @@ -27,7 +27,8 @@ stages: variables: FDO_DISTRIBUTION_VERSION: testing-slim FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/debian-install.sh' - FDO_DISTRIBUTION_TAG: "2019-08-02" + FDO_DISTRIBUTION_PACKAGES: 'ca-certificates' + FDO_DISTRIBUTION_TAG: "2024-02-24" container-build: extends: @@ -49,7 +50,7 @@ container-build: ACLOCAL_PATH: /usr/local/xserver-$XSERVER_VERSION/share/aclocal PKG_CONFIG_PATH: /usr/local/xserver-$XSERVER_VERSION/lib/pkgconfig -xserver-1.20: +xserver-21.1: extends: .default_build script: - ./autogen.sh @@ -57,6 +58,17 @@ xserver-1.20: - make install V=1 - make -j$(nproc) distcheck variables: + XSERVER_VERSION: "21.1" + +xserver-21.1-clang: + extends: .default_build + variables: + CC: clang + XSERVER_VERSION: "21.1" + +xserver-1.20: + extends: .default_build + variables: XSERVER_VERSION: "1.20" xserver-1.20-clang: |