diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2020-10-21 13:16:00 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2020-10-21 15:26:48 +1000 |
| commit | a752ca9fa00ac40867e580f9b94918f3335f0152 (patch) | |
| tree | 839bec4c1bf8cd83fa690667aaa0eb26ef145c67 | |
| parent | 626a1c17ca41ffc359fa827c71c828e21e0f9477 (diff) | |
| download | xkeyboard-config-a752ca9fa00ac40867e580f9b94918f3335f0152.tar.gz | |
Add the meson.build files to the tarballs
Together with a CI job that makes sure we can build with meson from the make
dist output.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | .gitlab-ci.yml | 23 | ||||
| -rw-r--r-- | Makefile.am | 10 |
2 files changed, 31 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index adf23f8..f591010 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,6 +15,7 @@ variables: stages: - build + - dist - test - gitlab @@ -43,6 +44,11 @@ stages: .meson_build: extends: .default_setup script: + - if [ x"$TARBALL" != "x" ]; then + mkdir tarball; + tar xf "$BUILDDIR/$TARBALL" -C tarball/ --strip-components=1; + pushd tarball > /dev/null; + fi - meson "$BUILDDIR" -Dprefix="$INSTDIR" - meson configure "$BUILDDIR" - ninja -C "$BUILDDIR" @@ -90,7 +96,13 @@ make_distcheck: extends: .default_build stage: build variables: - MAKE_EXTRA_COMMAND: "distcheck" + # pass VERSION to make so our tarball has a fixed name. + MAKE_EXTRA_COMMAND: "VERSION=master distcheck" + artifacts: + name: tarball + expire_in: 20 min + paths: + - $BUILDDIR/xkeyboard-config-master.tar.bz2 meson_build: extends: .meson_build @@ -118,6 +130,15 @@ meston_dist: variables: NINJA_EXTRA_COMMAND: "dist" +meson_from_tarball: + extends: .meson_build + stage: dist + dependencies: + - make_distcheck + variables: + TARBALL: "xkeyboard-config-master.tar.bz2" + GIT_STRATEGY: none + xmllint: image: archlinux/base dependencies: ['make_install'] diff --git a/Makefile.am b/Makefile.am index 743610b..44189a4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,9 +5,17 @@ SUBDIRS = compat geometry keycodes po rules symbols types docs man pkgconfigdir = $(datadir)/pkgconfig pkgconfig_DATA = xkeyboard-config.pc +mesonfiles = meson.build \ + meson_options.txt \ + po/meson.build \ + rules/meson.build \ + rules/compat/meson.build \ + $(NULL) + EXTRA_DIST=config.rpath COPYING README \ autogen.sh \ - xkeyboard-config.pc.in + xkeyboard-config.pc.in \ + $(mesonfiles) ACLOCAL_AMFLAGS = -I m4 |