From 53a56a5106329b79144be16c618ca477a05ef7e3 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 5 Oct 2020 23:18:12 +0200 Subject: [PATCH] build/travis: remove travis integration We already build a large variety of configurations in gitlab-ci, we don't need yet another configuration to run tests on travis-ci. Also, because the travis-ci setup is outdated and we don't look at it. Let's focus on gitlab-ci instead. --- .travis.yml | 75 ------------------------------------ contrib/scripts/nm-ci-run.sh | 12 ------ 2 files changed, 87 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 57e68af9a8..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,75 +0,0 @@ -language: c -dist: xenial -sudo: required -compiler: - - gcc - - clang - -addons: - apt: - packages: - - autoconf - - automake - - dbus - - dbus-x11 - - dnsmasq - - gobject-introspection - - gtk-doc-tools - - intltool - - iptables - - libcurl4-gnutls-dev - - libdbus-1-dev - - libgcrypt11-dev - - libgirepository1.0-dev - - libglib2.0-dev - - libglib2.0-doc - - libgnutls-dev - - libiw-dev - - libjansson-dev - - libjansson4 - - libmm-glib-dev - - libndp-dev - - libnewt-dev - - libnss3-dev - - libpolkit-gobject-1-dev - - libreadline-dev - - libteam-dev - - libtool - - libudev-dev - - make - - mobile-broadband-provider-info - - pkg-config - - ppp - - ppp-dev - - python-dbus - - python-gi - - python-software-properties - - python3-pip - - python3-setuptools - - uuid-dev - coverity_scan: - project: - name: NetworkManager/NetworkManager - build_command_prepend: sh autogen.sh --with-systemd-logind=no --enable-more-warnings=no --disable-ovs - build_command: make -j4 - branch_pattern: .*coverity.* - -before_install: - - sudo dbus-uuidgen --ensure - - | - if test "$BUILD_TYPE" == 'meson'; then - pip3 install ninja - pip3 install meson - fi - - sudo chmod o+x /usr/sbin/pppd - - sudo locale-gen pl_PL.UTF-8 - -script: - - CI=travis contrib/scripts/nm-ci-run.sh - -env: - matrix: - - BUILD_TYPE=autotools - - BUILD_TYPE=meson - global: - secure: K36MXkcsuDZ0msuEj5zHMmHfv6O725lsXuFdP6AJ3rYWKuLYE1+iNLgIRndNWDK9ckkNQFaCxDY4Z/NCfCYQTGAS9oXR5AwNqNbhOq8XrqdaZ2GX35sob8Tp4B3IsoREkN/UbIkXQKYlA5rUhgtSifUg3EwfeOiFvnLCwHcp0rYHnvT/jaq5vodBbA1jChjezcMHsp43kvPXHpybKRkipb9EzV/V3VtDLLWh9WQBvQNawpsHnT+MXSke1yU1zfNMyD9XiD7VDzCwaTs6LzjoFBLc86QS5U/9W72s0rFe6SbecntQHftknRzSrGiJDNe64wDZN/Wxq1MHxEOFCwDi6vcSwQ+RoTdhyshhfPVY2Mm5soj2w7Dx43Cz0dDZDCMhu5xxzFAFgkieJSfwXbuxga0ds58Ph8MgtDSp3fBRewZwI+vMuzl7a1hGkcqJojrm1lfgAKbNgrNUzQRwbVYAyrpa6/vCbd6ZH4PEtITwLaRf2mz8PG71xiMQguDDDXS8WF0U7Looe+G9ybAUwDS5hqHfeP+3q6bfN5Sg5Zs5QkBIN5LZbeWbPYldOEEDTvo3VI7e84bk7U5qEoUKc0w/tqVF1B5KgNUq6nIkCkmoBx8RFnmjpOHh99IfeRG9nQTRpCaEDvAM4fcRzITzId8dIIfAW/45P3ozzfz/HYiie+o= diff --git a/contrib/scripts/nm-ci-run.sh b/contrib/scripts/nm-ci-run.sh index 52dffe2672..4d46ddb018 100755 --- a/contrib/scripts/nm-ci-run.sh +++ b/contrib/scripts/nm-ci-run.sh @@ -67,12 +67,6 @@ case "$CI" in ""|"true"|"default"|"gitlab") CI=default ;; - "travis") - _WITH_WERROR=0 - _WITH_LIBTEAM="$_FALSE" - _WITH_DOCS="$_FALSE" - _WITH_SYSTEMD_LOGIND="$_FALSE" - ;; *) die "invalid \$CI \"$CI\"" ;; @@ -172,12 +166,6 @@ run_autotools() { export NM_TEST_CLIENT_CHECK_L10N=1 - if [ "$CI" == travis ]; then - # travis is known to generate the settings doc differently. - # Don't compare. - export NMTST_NO_CHECK_SETTINGS_DOCS=yes - fi - if ! make check -j 6 -k ; then _print_test_logs "first-test"