diff options
| author | Simon Ser <contact@emersion.fr> | 2020-12-14 14:46:46 +0100 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2021-03-05 09:15:04 +0000 |
| commit | 3bda3d1b4729c8ee7c533520a199611cb841bc8f (patch) | |
| tree | 586d317781dcbd030bb2c288892b4a1bcc42cbdb /.gitlab-ci.yml | |
| parent | server: add wl_display getter for wl_global (diff) | |
| download | wayland-3bda3d1b4729c8ee7c533520a199611cb841bc8f.tar wayland-3bda3d1b4729c8ee7c533520a199611cb841bc8f.tar.gz wayland-3bda3d1b4729c8ee7c533520a199611cb841bc8f.tar.bz2 wayland-3bda3d1b4729c8ee7c533520a199611cb841bc8f.tar.lz wayland-3bda3d1b4729c8ee7c533520a199611cb841bc8f.tar.xz wayland-3bda3d1b4729c8ee7c533520a199611cb841bc8f.tar.zst wayland-3bda3d1b4729c8ee7c533520a199611cb841bc8f.zip | |
build: drop autotools
Meson now replaces autotools.
Signed-off-by: Simon Ser <contact@emersion.fr>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 33 |
1 files changed, 3 insertions, 30 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b2e174f..d2b0743 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,13 +14,13 @@ stages: variables: - DEBIAN_PACKAGES: 'build-essential automake autoconf libtool pkg-config libexpat1-dev libffi-dev libxml2-dev doxygen graphviz xmlto xsltproc docbook-xsl python3-pip python3-setuptools ninja-build' + DEBIAN_PACKAGES: 'build-essential pkg-config libexpat1-dev libffi-dev libxml2-dev doxygen graphviz xmlto xsltproc docbook-xsl python3-pip python3-setuptools ninja-build' DEBIAN_EXEC: 'pip3 install meson==0.52.1' # these tags should be updated each time the list of packages is updated # changing these will force rebuilding the associated image # Note: these tags have no meaning and are not tied to a particular # wayland version - DEBIAN_TAG: '2020-06-05.1' + DEBIAN_TAG: '2020-12-14.0' FDO_UPSTREAM_REPO: wayland/wayland @@ -41,34 +41,7 @@ debian:buster@container-prep: GIT_STRATEGY: none -build-native-autotools: - extends: - - .debian.buster - - .fdo.distribution-image@debian - stage: build - script: - - export BUILD_ID="wayland-$CI_JOB_NAME_$CI_COMMIT_SHA-$CI_JOB_ID" - - export PREFIX="$(pwd)/prefix-$BUILD_ID" - - export BUILDDIR="$(pwd)/build-$BUILD_ID" - - export MAKEFLAGS="-j4" - - mkdir "$BUILDDIR" "$PREFIX" - - cd "$BUILDDIR" - - ../autogen.sh --prefix="$PREFIX" --with-icondir=/usr/share/X11/icons - - make all - - make check - - make install - - make distcheck - artifacts: - name: wayland-$CI_COMMIT_SHA-$CI_JOB_ID - when: always - paths: - - build-*/wayland-*.tar.xz - - build-*/wayland*/_build/sub/*.log - - build-*/*.log - - prefix-* - - -build-native-meson: +build-native: extends: - .debian.buster - .fdo.distribution-image@debian |