[gentoo-commits] proj/portage-utils:master commit in: tests/valgrind-wrapper/, travis/, /

[Fabian Groffen]

commit:     e106383b82df59b81bf1a5a862f893717547fd6d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  6 12:31:15 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Feb  6 12:31:15 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=e106383b

travis: remove

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 .travis.yml                      | 67 ----------------------------------------
 tests/valgrind-wrapper/qvalgrind |  2 +-
 travis/install-blake2.sh         | 33 --------------------
 travis/lib.sh                    | 38 -----------------------
 travis/main.sh                   | 37 ----------------------
 5 files changed, 1 insertion(+), 176 deletions(-)

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index af1504c..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-# Travis build integration.
-# https://docs.travis-ci.com/
-
-language: c
-dist: focal
-os: linux
-osx_image: xcode11.3.1
-
-jobs:
-  include:
-    - compiler: gcc
-      arch: amd64
-    - compiler: gcc
-      arch: arm64
-    - compiler: gcc
-      arch: ppc64le
-    - compiler: gcc
-      arch: s390x
-    - compiler: clang
-      arch: amd64
-    - compiler: coverity
-      arch: amd64
-      env:
-        - COVERITY_SCAN_PROJECT_NAME="$TRAVIS_REPO_SLUG"
-        - COVERITY_SCAN_BRANCH_PATTERN="master"
-        - COVERITY_SCAN_NOTIFICATION_EMAIL="grobian@g.o"
-        - COVERITY_SCAN_BUILD_COMMAND="make"
-    - compiler: valgrind
-      arch: amd64
-      env:
-        - CFLAGS="-g"
-        - Q_RUN_WITH_VALGRIND=1
-    - compiler: clang
-      os: osx
-      env:
-        - LDFLAGS="-L/usr/local/opt/libressl/lib"
-        - CPPFLAGS="-I/usr/local/opt/libressl/include"
-        - PATH="$(brew --prefix)/opt/gnu-sed/libexec/gnubin:$PATH"
-        - PATH="$(brew --prefix)/opt/coreutils/libexec/gnubin:$PATH"
-
-env:
-  global:
-    - secure: "qF/ueXvm1uawirfQL+jK5LSJW1P+ZVXDx5t9HljFP1jC45D/1aqEs1ffaNkvBJohUJy6mABnXN5+ZP0PoQ+ZA01t+6NDc/LrowGP87T02KGwjBukQ9tQK8zVutsT+0CY3qUPhRcaLH5Gt3c+uPDKlLndg/bXWS6cRpMt6tC3VTy+WpAlvHHfZJjSZVYp8qhCattnaZ7GvzqGqbjBZ6X7TrQnwIDdGAyg5r4xnViDxu9lO4ZH4zS6Rc7DxesrqC3zxwPRw5HLNsGbJiGQF3meXH6rVNt1uxKwwOQoDcL0NKiyAMpXwu5iGeuMILoy3KMpFwZFnhyXqMGRORakDuDNB9oMgzp+PB3Zb7TICXbhxbrQ46lSlv0VWkwn3bcJ0lek53NzDUmM2uywvCUYybPgn3xCqY9jG0zwO2ZIACc1ekGh7y0gFXfBoSZGhl1VthV5hWMJ01p/n5jK7XdDmK4G/+0wN2WlHhyvjoF6XyJ+SRC85l6VhpBNbFJA2bGT2Y4+p/CzF7M8DVYR3o+OfCWxsiZyE+Vnmpdg4U829oy97obIuBeCvBd1Vp0hoB+RpzaeqzS69N+S4tgCIXvIdu168HltFaTUPtvIGoDtIAPCaUZC8jVO22cA6RpNkac3HjpLSceYYtdkiph4VuBMwHZj6/N2+m46Y9Uxrh01KzLy/GY="
-
-addons:
-  apt:
-    packages:
-    - libgpgme11-dev
-    - gnupg2
-    - valgrind
-    - liblz4-tool
-    - lzop
-    - zstd
-    - lzip
-    - brotli
-  homebrew:
-    packages:
-    - gpgme
-    - gnupg
-    - gnu-sed
-    - coreutils
-    - bash
-    - libressl
-
-before_install:
-  - ./travis/install-blake2.sh
-script: ./travis/main.sh

diff --git a/tests/valgrind-wrapper/qvalgrind b/tests/valgrind-wrapper/qvalgrind
index 7240e98..5286cf6 100755
--- a/tests/valgrind-wrapper/qvalgrind
+++ b/tests/valgrind-wrapper/qvalgrind
@@ -16,7 +16,7 @@ if [[ ${ret} == 234 ]] ; then
 	mv q-valgrind.log q-valgrind.$$.log
 	echo "valgrind log can be found at ${PWD}/q-valgrind.$$.log" > /dev/stderr
 	# dump complaints in Travis' log, as we cannot retrieve them lateron
-	[[ -n ${TRAVIS_OS_NAME} ]] && cat q-valgrind.$$.log > /dev/stderr
+	[[ -n ${RUNNER_OS} ]] && cat q-valgrind.$$.log > /dev/stderr
 else
 	rm q-valgrind.log
 fi

diff --git a/travis/install-blake2.sh b/travis/install-blake2.sh
deleted file mode 100755
index 92e58ff..0000000
--- a/travis/install-blake2.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash -e
-
-. "${0%/*}"/lib.sh
-
-main() {
-	local pv="0.98.1"
-	local S="libb2-${pv}"
-	travis_fold start dep-blake2
-	rm -rf libb2*
-	v mkdir -p ../sysroot
-	v wget https://github.com/BLAKE2/libb2/releases/download/v${pv}/libb2-${pv}.tar.gz
-	v tar xf libb2-${pv}.tar.gz
-	(
-		cd "${S}"
-		./configure \
-			--enable-static \
-			--disable-shared \
-			--disable-openmp \
-			--prefix=/ \
-			--libdir=/ \
-			--includedir=/
-		m
-		m DESTDIR="${PWD}/../../sysroot" install
-	)
-	v rm -f ../sysroot/*.la
-	v rm -rf libb2*
-	travis_fold end dep-blake2
-}
-
-if [[ ${CC} == valgrind || ${CC} == coverity ]] ; then
-	export CC=gcc
-fi
-main "$@"

diff --git a/travis/lib.sh b/travis/lib.sh
deleted file mode 100644
index 687ed41..0000000
--- a/travis/lib.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-# Common funcs for working w/Travis.
-
-travis_fold() {
-	if [[ -n ${TRAVIS_OS_NAME} ]] ; then
-		printf 'travis_fold:%s:%s\r\n' "$@" | sed 's: :_:g'
-	fi
-}
-
-if [[ -n ${TRAVIS_OS_NAME} ]] ; then
-	whitebg=$(tput setab 7)
-	blackfg=$(tput setaf 0)
-	normal=$(tput sgr0)
-else
-	whitebg=
-	blackbg=
-	normal=
-fi
-v() {
-	local fold=""
-	case $1 in
-	--fold=*) fold=${1:7}; shift;;
-	esac
-	if [[ -n ${fold} ]] ; then
-		travis_fold start "${fold}"
-		echo "\$ $*"
-		"$@"
-		travis_fold end "${fold}"
-	else
-		echo "${whitebg}${blackfg}\$ $*${normal}"
-		"$@"
-	fi
-}
-
-ncpus=$(getconf _NPROCESSORS_ONLN)
-m() {
-	v make -j${ncpus} "$@"
-}

diff --git a/travis/main.sh b/travis/main.sh
deleted file mode 100755
index 2c1670c..0000000
--- a/travis/main.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash -e
-
-. "${0%/*}"/lib.sh
-
-# For local deps like blake2b.
-export CPPFLAGS="${CPPFLAGS} -I${PWD}/../sysroot"
-export LDFLAGS="${LDFLAGS} -L${PWD}/../sysroot"
-
-# ignore timestamps which git doesn't preserve
-# disable openmp because Clang's libomp isn't installed
-DEFARGS="--disable-maintainer-mode --disable-openmp"
-
-do_run() {
-  v ./configure ${*}
-
-  # Standard optimized build.
-  m V=1
-  m check
-  m clean
-}
-
-if [[ ${CC} == coverity ]] ; then
-  [[ -n ${COVERITY_SCAN_TOKEN} ]] || exit 0;  # don't fail on this for PRs
-  # ensure we end up with an existing compiler
-  export CC=gcc
-  v ./configure ${DEFARGS} --enable-qmanifest --enable-qtegrity
-  curl -s 'https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh' | bash || true
-elif [[ ${CC} == valgrind ]] ; then
-  export CC=gcc
-  do_run CFLAGS=-g ${DEFARGS} --enable-qmanifest --enable-qtegrity
-else
-  do_run ${DEFARGS}
-  do_run ${DEFARGS} --enable-qmanifest --enable-qtegrity
-  do_run ${DEFARGS} --disable-qmanifest --enable-qtegrity
-  do_run ${DEFARGS} --enable-qmanifest --disable-qtegrity
-  do_run ${DEFARGS} --disable-qmanifest --disable-qtegrity
-fi