diff options
author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2023-11-18 11:52:04 -0800 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2023-11-18 11:52:04 -0800 |
commit | f11467df3c9e54469fb629762dc3bc35baa563aa (patch) | |
tree | f5bfffbee7427b28e32d7472ef5448cc1d92dcd6 /.gitlab-ci.yml | |
parent | aed8d7ced841f9c5af757bf24e5488828d5c77e6 (diff) |
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 67 |
1 files changed, 63 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d2dd91a..310fd87 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 185ede0e9b9b1924b92306ab8b882a6294e92613 # see https://docs.gitlab.com/ee/ci/yaml/#includefile include: @@ -16,6 +16,7 @@ include: ref: *template_sha file: '/templates/ci-fairy.yml' + stages: - prep # prep work like rebuilding the container images if there is a change - build # for actually building and testing things in a container @@ -28,8 +29,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-02-15.0' - FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake make xorg-util-macros' + FDO_DISTRIBUTION_TAG: '2023-11-18.0' + FDO_DISTRIBUTION_PACKAGES: 'git pkgconf autoconf automake make meson ninja jq xorg-util-macros' # @@ -81,7 +82,7 @@ container-prep: # # The default build, runs on the image built above. # -build: +autotools: stage: build extends: - .fdo.distribution-image@arch @@ -92,5 +93,63 @@ build: - ../configure --disable-silent-rules - make - make check + - make install - make distcheck + - mv xbitmaps*.tar.gz .. - popd > /dev/null + artifacts: + paths: + - xbitmaps*.tar.gz + +meson: + extends: + - .fdo.distribution-image@arch + stage: build + script: + - mkdir -p ../_inst + - meson setup builddir --prefix="$PWD/../_inst" + - meson install -C builddir + +meson from tarball: + extends: + - .fdo.distribution-image@arch + stage: test + script: + - mkdir -p _tarball_build + - tar xf xbitmaps-*.tar.gz -C _tarball_build + - pushd _tarball_build/xbitmaps-* + - meson setup builddir + - meson install -C builddir + needs: + - autotools + variables: + GIT_STRATEGY: none + +compare meson and autotools: + extends: + - .fdo.distribution-image@arch + stage: test + script: + - mkdir -p $PWD/_meson_inst + - mkdir -p $PWD/_autotools_inst + # the prefix ends up in the pkgconfig files, so we use a symlink + # to use the same --prefix for meson and autotools + - ln -sf $PWD/_meson_inst $PWD/_inst + - meson setup builddir --prefix=$PWD/_inst + - meson install -C builddir + - rm $PWD/_inst + - ln -sf $PWD/_autotools_inst $PWD/_inst + - autoreconf -ivf + - ./configure --prefix=$PWD/_inst + - make && make install + - diff --brief --recursive $PWD/_meson_inst $PWD/_autotools_inst + +check versions are in sync: + extends: + - .fdo.distribution-image@arch + stage: test + script: + - autoreconf -ivf + - ./configure --version | head -n 1 | sed -e 's/xbitmaps configure //' > autotools.version + - meson introspect meson.build --projectinfo | jq -r '.version' > meson.version + - diff -u autotools.version meson.version || (echo "ERROR - autotools and meson versions not in sync" && false) |