diff options
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 91 |
1 files changed, 80 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c88f6cd..eb5cbbf 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: @@ -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: '2022-07-17.0' - FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake libtool make xorg-util-macros xorgproto libx11' + FDO_DISTRIBUTION_TAG: '2023-11-04.0' + FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake libtool make meson ninja jq xorg-util-macros xorgproto libx11' # @@ -79,20 +79,89 @@ container-prep: variables: GIT_STRATEGY: none - # -# The default build, runs on the image built above. +# Builds run on the image built above. # -build: + +meson: + extends: + - .fdo.distribution-image@arch stage: build + script: + - mkdir -p ../_inst + - meson setup builddir --prefix="$PWD/../_inst" -Dwarning_level=3 + - meson configure builddir + - ninja -C builddir test + - ninja -C builddir install + +autotools: extends: - .fdo.distribution-image@arch + stage: build script: + - mkdir -p ../_inst _build - autoreconf -ivf - - mkdir _builddir - - pushd _builddir > /dev/null - - ../configure --disable-silent-rules - - make + - pushd _build + - ../configure --prefix="$PWD/../_inst" - make check + - make install - make distcheck - - popd > /dev/null + - mv libxkbfile*.tar.gz .. + - popd + artifacts: + paths: + - libxkbfile*.tar.gz + +meson from tarball: + extends: + - .fdo.distribution-image@arch + stage: test + script: + - mkdir -p _tarball_build + - tar xf libxkbfile-*.tar.gz -C _tarball_build + - pushd _tarball_build/libxkbfile-* + - meson setup builddir + - meson configure builddir + - ninja -C builddir test + needs: + - autotools + variables: + GIT_STRATEGY: none + +# +# Unlike the xproto version this was copied from, this just compares +# the ls output to make sure the same files were installed, since +# comparing file contents lists mismatches with the ELF binaries and +# in the generated pkg-config files that are not issues here. +# +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 + - ninja -C builddir install + - ls -R _inst > _meson_inst.ls + - rm $PWD/_inst + - ln -sf $PWD/_autotools_inst $PWD/_inst + - autoreconf -ivf + - ./configure --prefix=$PWD/_inst --enable-shared --disable-static + - make && make install + - rm -f $PWD/_inst/lib/lib*.la + - ls -R _inst > _autotools_inst.ls + - diff -u $PWD/_meson_inst.ls $PWD/_autotools_inst.ls + +check versions are in sync: + extends: + - .fdo.distribution-image@arch + stage: test + script: + - autoreconf -ivf + - ./configure --version | head -n 1 | sed -e 's/libxkbfile 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) |