[gentoo-commits] proj/portage-utils:master commit in: travis/

2020-01-04 Thread Fabian Groffen
commit: 1618cd3e114309e62d10e5f6cbf468a3e91b8985
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Jan  4 10:47:29 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Jan  4 10:47:29 2020 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=1618cd3e

travis: ensure we keep env-set CPPFLAGS/LDFLAGS

Signed-off-by: Fabian Groffen  gentoo.org>

 travis/main.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/travis/main.sh b/travis/main.sh
index 6313d1b..2c1670c 100755
--- a/travis/main.sh
+++ b/travis/main.sh
@@ -3,8 +3,8 @@
 . "${0%/*}"/lib.sh
 
 # For local deps like blake2b.
-export CPPFLAGS="-I${PWD}/../sysroot"
-export LDFLAGS="-L${PWD}/../sysroot"
+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



[gentoo-commits] proj/portage-utils:master commit in: travis/

2020-01-03 Thread Fabian Groffen
commit: 71e52bce427ac05fc92e15ffd35ffe4d40c4e1a3
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Jan  3 15:07:12 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Jan  3 15:07:12 2020 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=71e52bce

travis: coverity fails with "success", so just ignore output

Signed-off-by: Fabian Groffen  gentoo.org>

 travis/main.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/travis/main.sh b/travis/main.sh
index 5cbd480..6313d1b 100755
--- a/travis/main.sh
+++ b/travis/main.sh
@@ -24,7 +24,7 @@ if [[ ${CC} == coverity ]] ; then
   # 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
+  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



[gentoo-commits] proj/portage-utils:master commit in: travis/

2020-01-03 Thread Fabian Groffen
commit: 5743951c803b852e3ff48535b1ba5cfe89a2dd8a
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Jan  3 15:00:23 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Jan  3 15:00:23 2020 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=5743951c

travis: drop old coverity call

Signed-off-by: Fabian Groffen  gentoo.org>

 travis/main.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/travis/main.sh b/travis/main.sh
index 52a3c90..5cbd480 100755
--- a/travis/main.sh
+++ b/travis/main.sh
@@ -21,9 +21,6 @@ do_run() {
 
 if [[ ${CC} == coverity ]] ; then
   [[ -n ${COVERITY_SCAN_TOKEN} ]] || exit 0;  # don't fail on this for PRs
-  # Do scans last as they like to dirty the tree and some tests
-  # expect a clean tree (like code style checks).
-  v --fold="coverity_scan" coverity_scan
   # ensure we end up with an existing compiler
   export CC=gcc
   v ./configure ${DEFARGS} --enable-qmanifest --enable-qtegrity



[gentoo-commits] proj/portage-utils:master commit in: travis/

2020-01-03 Thread Fabian Groffen
commit: 199e9db25a2aa7bed23d26cb7f835cf0569bd66d
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Jan  3 14:55:23 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Jan  3 14:55:23 2020 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=199e9db2

travis: fix blake2b installation for coverity or valgrind

Signed-off-by: Fabian Groffen  gentoo.org>

 travis/install-blake2.sh | 4 
 1 file changed, 4 insertions(+)

diff --git a/travis/install-blake2.sh b/travis/install-blake2.sh
index 4a2bc20..92e58ff 100755
--- a/travis/install-blake2.sh
+++ b/travis/install-blake2.sh
@@ -26,4 +26,8 @@ main() {
v rm -rf libb2*
travis_fold end dep-blake2
 }
+
+if [[ ${CC} == valgrind || ${CC} == coverity ]] ; then
+   export CC=gcc
+fi
 main "$@"



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

2020-01-03 Thread Fabian Groffen
commit: 00c6d147bbeed3345c242d21fc237c10ddf0e023
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Jan  3 14:48:36 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Jan  3 14:48:36 2020 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=00c6d147

travis: try testing on macOS, fix coverity run

This is guesswork, no way to test but push to Travis...

Signed-off-by: Fabian Groffen  gentoo.org>

 .travis.yml| 39 ++---
 travis/main.sh | 90 +-
 2 files changed, 61 insertions(+), 68 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 97c8e85..981cd4d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,18 +2,32 @@
 # https://docs.travis-ci.com/
 
 language: c
-# Order here matters for implicit matrix generation and coverity scan.
-# See travis/main.sh for details.
-compiler:
-  - gcc
-  - clang
-
 sudo: false
 
-# Order here matters; see compiler comment above.
-os:
-  - linux
-dist: xenial
+matrix:
+  include:
+- compiler: gcc
+  os: linux
+  dist: bionic
+- compiler: clang
+  os: linux
+  dist: bionic
+- compiler: coverity
+  os: linux
+  dist: bionic
+  env:
+- COVERITY_SCAN_PROJECT_NAME="$TRAVIS_REPO_SLUG"
+- COVERITY_SCAN_BRANCH_PATTERN="master"
+- COVERITY_SCAN_NOTIFICATION_EMAIL="grob...@gentoo.org"
+- COVERITY_SCAN_BUILD_COMMAND="make"
+- compiler: valgrind
+  os: linux
+  dist: bionic
+  env:
+- CFLAGS="-g"
+- Q_RUN_WITH_VALGRIND=1
+- compiler: clang
+  os: osx
 
 env:
   global:
@@ -25,6 +39,11 @@ addons:
 - libgpgme11-dev
 - gnupg2
 - valgrind
+  homebrew:
+packages:
+- gpgme
+- gnupg
+#update: true
 
 before_install:
   - ./travis/install-blake2.sh

diff --git a/travis/main.sh b/travis/main.sh
index 6f55073..52a3c90 100755
--- a/travis/main.sh
+++ b/travis/main.sh
@@ -2,65 +2,39 @@
 
 . "${0%/*}"/lib.sh
 
-# We have to do this by hand rather than use the coverity addon because of
-# matrix explosion: https://github.com/travis-ci/travis-ci/issues/1975
-# We also do it by hand because when we're throttled, the addon will exit
-# the build immediately and skip the main script!
-coverity_scan() {
-   local reason
-   [[ ${TRAVIS_JOB_NUMBER} != *.1 ]] && reason="not first build job"
-   [[ -n ${TRAVIS_TAG} ]] && reason="git tag"
-   [[ ${TRAVIS_PULL_REQUEST} == "true" ]] && reason="pull request"
-   if [[ -n ${reason} ]] ; then
-   echo "Skipping coverity scan due to: ${reason}"
-   return
-   fi
+# For local deps like blake2b.
+export CPPFLAGS="-I${PWD}/../sysroot"
+export LDFLAGS="-L${PWD}/../sysroot"
 
-   export COVERITY_SCAN_PROJECT_NAME="${TRAVIS_REPO_SLUG}"
-   export COVERITY_SCAN_NOTIFICATION_EMAIL="grob...@gentoo.org"
-   export COVERITY_SCAN_BUILD_COMMAND="make -j${ncpus}"
-   export COVERITY_SCAN_BUILD_COMMAND_PREPEND="git clean -q -x -d -f; git 
checkout -f"
-   export COVERITY_SCAN_BRANCH_PATTERN="master"
+# ignore timestamps which git doesn't preserve
+# disable openmp because Clang's libomp isn't installed
+DEFARGS="--disable-maintainer-mode --disable-openmp"
 
-   curl -s 
"https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh; | bash || :
-}
-
-main() {
-   # For local deps like blake2b.
-   export CPPFLAGS="-I${PWD}/../sysroot"
-   export 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
-   }
+do_run() {
+  v ./configure ${*}
 
-   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
-
-   if [[ ${TRAVIS_OS_NAME} == linux ]] ; then
-   export Q_RUN_WITH_VALGRIND=1
-   do_run CFLAGS=-g ${DEFARGS} --enable-qmanifest --enable-qtegrity
-   fi
-
-   # LSan needs sudo, which we don't use at the moment
-   # Debug build w/ASAN and such enabled.
-   #m debug
-   #m check
-
-   # Do scans last as they like to dirty the tree and some tests
-   # expect a clean tree (like code style checks).
-   v --fold="coverity_scan" coverity_scan
+  # Standard optimized build.
+  m V=1
+  m check
+  m clean
 }
-main "$@"
+
+if [[ ${CC} == coverity ]] ; then
+  [[ -n ${COVERITY_SCAN_TOKEN} ]] || exit 0;  # don't fail on this for PRs
+  # Do scans last as they like to dirty the tree and some tests
+  # expect a clean tree (like 

[gentoo-commits] proj/portage-utils:master commit in: travis/

2020-01-02 Thread Fabian Groffen
commit: 3246fde76f7d3bd0ea03cf7913032981e62cff23
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Jan  2 15:24:06 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu Jan  2 15:24:06 2020 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=3246fde7

travis: try differently to get valgrind to run

Signed-off-by: Fabian Groffen  gentoo.org>

 travis/main.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/travis/main.sh b/travis/main.sh
index 50f10c7..6f55073 100755
--- a/travis/main.sh
+++ b/travis/main.sh
@@ -50,8 +50,8 @@ main() {
do_run ${DEFARGS} --disable-qmanifest --disable-qtegrity
 
if [[ ${TRAVIS_OS_NAME} == linux ]] ; then
-   do_run CFLAGS=-g Q_RUN_WITH_VALGRIND=1 \
-   ${DEFARGS} --enable-qmanifest --enable-qtegrity
+   export Q_RUN_WITH_VALGRIND=1
+   do_run CFLAGS=-g ${DEFARGS} --enable-qmanifest --enable-qtegrity
fi
 
# LSan needs sudo, which we don't use at the moment



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

2019-12-31 Thread Fabian Groffen
commit: f960fda83cf57ad529fe34fb996a92cb8be7bf44
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Dec 31 09:10:22 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Dec 31 09:10:22 2019 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=f960fda8

buildsys: regen

Signed-off-by: Fabian Groffen  gentoo.org>

 Makefile.in| 6 +++---
 travis/main.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 0ffd8c6..7403b5b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1610,9 +1610,9 @@ q_CPPFLAGS = -I$(top_srcdir)/libq 
-I$(top_builddir)/autotools/gnulib \
-I$(top_srcdir)/autotools/gnulib $(NULL) $(am__append_2) \
$(am__append_7)
 q_LDADD = $(top_builddir)/libq/libq.la \
-   $(top_builddir)/autotools/gnulib/libgnu.a -liniparser \
-   $(LIBSSL) $(LIBBL2) $(LIBZ) $(GPGME_LIBS) $(LIB_CLOCK_GETTIME) \
-   $(LIB_EACCESS) $(NULL) $(am__append_3) $(am__append_8)
+   $(top_builddir)/autotools/gnulib/libgnu.a $(LIBSSL) $(LIBBL2) \
+   $(LIBZ) $(GPGME_LIBS) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS) \
+   $(NULL) $(am__append_3) $(am__append_8)
 EXTRA_DIST = \
autotools/m4/gnulib-cache.m4 \
applets.h \

diff --git a/travis/main.sh b/travis/main.sh
index 7154ce5..c5f7670 100755
--- a/travis/main.sh
+++ b/travis/main.sh
@@ -26,7 +26,7 @@ coverity_scan() {
 }
 
 main() {
-   # For local deps like iniparser.
+   # For local deps like blake2b.
export CPPFLAGS="-I${PWD}/../sysroot"
export LDFLAGS="-L${PWD}/../sysroot"
 



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

2019-12-31 Thread Fabian Groffen
commit: 1f9574907f390a136ce57d4ad248349fe108bfe8
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Dec 31 09:05:32 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Dec 31 09:05:32 2019 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=1f957490

travis: we no longer need iniparser

Signed-off-by: Fabian Groffen  gentoo.org>

 .travis.yml |  1 -
 travis/install-iniparser.sh | 18 --
 2 files changed, 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2a51c0d..83a6ff6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,5 @@ addons:
 - gnupg2
 
 before_install:
-  - ./travis/install-iniparser.sh
   - ./travis/install-blake2.sh
 script: ./travis/main.sh

diff --git a/travis/install-iniparser.sh b/travis/install-iniparser.sh
deleted file mode 100755
index c0edd83..000
--- a/travis/install-iniparser.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash -e
-
-. "${0%/*}"/lib.sh
-
-main() {
-   local pv="3.1"
-   local S="iniparser"
-   travis_fold start dep-iniparser
-   rm -rf iniparser*
-   v mkdir -p ../sysroot
-   v wget http://distfiles.gentoo.org/distfiles/iniparser-${pv}.tar.gz
-   v tar xf iniparser-${pv}.tar.gz
-   m -C ${S}
-   v cp ${S}/libiniparser.a ${S}/src/{dictionary,iniparser}.h ../sysroot/
-   v rm -rf iniparser*
-   travis_fold end dep-iniparser
-}
-main "$@"



[gentoo-commits] proj/portage-utils:master commit in: travis/

2019-07-18 Thread Fabian Groffen
commit: fa4cb71cdc27c72ceb64d2f60f0ae227c1af9337
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Jul 18 17:50:04 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu Jul 18 17:50:04 2019 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=fa4cb71c

travis: fix typo, ensure we recompile files after configure

Signed-off-by: Fabian Groffen  gentoo.org>

 travis/main.sh | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/travis/main.sh b/travis/main.sh
index c5ce010..7154ce5 100755
--- a/travis/main.sh
+++ b/travis/main.sh
@@ -40,13 +40,14 @@ main() {
# Standard optimized build.
m V=1
m check
+   m clean
}
 
do_run ${DEFARGS}
do_run ${DEFARGS} --enable-qmanifest --enable-qtegrity
-   do_run ${DEFARGS} --distable-qmanifest --enable-qtegrity
-   do_run ${DEFARGS} --enable-qmanifest --distable-qtegrity
-   do_run ${DEFARGS} --disable-qmanifest --distable-qtegrity
+   do_run ${DEFARGS} --disable-qmanifest --enable-qtegrity
+   do_run ${DEFARGS} --enable-qmanifest --disable-qtegrity
+   do_run ${DEFARGS} --disable-qmanifest --disable-qtegrity
 
# LSan needs sudo, which we don't use at the moment
# Debug build w/ASAN and such enabled.



[gentoo-commits] proj/portage-utils:master commit in: travis/

2019-07-18 Thread Fabian Groffen
commit: 73577cafa452ae8df91e6fcc776bb9411ce6efc6
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Jul 18 17:46:39 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu Jul 18 17:46:39 2019 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=73577caf

travis: test permutations of enabled/disabled features

Bug: https://bugs.gentoo.org/689896
Signed-off-by: Fabian Groffen  gentoo.org>

 travis/main.sh | 18 ++
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/travis/main.sh b/travis/main.sh
index bfb7aae..c5ce010 100755
--- a/travis/main.sh
+++ b/travis/main.sh
@@ -32,11 +32,21 @@ main() {
 
# ignore timestamps which git doesn't preserve
# disable openmp because Clang's libomp isn't installed
-   v ./configure --disable-maintainer-mode --disable-openmp
+   DEFARGS="--disable-maintainer-mode --disable-openmp"
 
-   # Standard optimized build.
-   m V=1
-   m check
+   do_run() {
+   v ./configure ${*}
+
+   # Standard optimized build.
+   m V=1
+   m check
+   }
+
+   do_run ${DEFARGS}
+   do_run ${DEFARGS} --enable-qmanifest --enable-qtegrity
+   do_run ${DEFARGS} --distable-qmanifest --enable-qtegrity
+   do_run ${DEFARGS} --enable-qmanifest --distable-qtegrity
+   do_run ${DEFARGS} --disable-qmanifest --distable-qtegrity
 
# LSan needs sudo, which we don't use at the moment
# Debug build w/ASAN and such enabled.



[gentoo-commits] proj/portage-utils:master commit in: travis/

2019-05-21 Thread Fabian Groffen
commit: 53b31a333ad3b9123b4ee5541295e6b5f00080cd
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue May 21 14:55:51 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue May 21 14:55:51 2019 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=53b31a33

travis: build blake2 without openmp to avoid trouble

Signed-off-by: Fabian Groffen  gentoo.org>

 travis/install-blake2.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/travis/install-blake2.sh b/travis/install-blake2.sh
index 36989d8..4a2bc20 100755
--- a/travis/install-blake2.sh
+++ b/travis/install-blake2.sh
@@ -15,12 +15,14 @@ main() {
./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
 }



[gentoo-commits] proj/portage-utils:master commit in: travis/

2019-05-21 Thread Fabian Groffen
commit: 2a905aad54eb5ad13d21371b79eada5401d012ad
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue May 21 14:52:25 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue May 21 14:52:25 2019 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=2a905aad

travis: build verbose so we can see what's done

Signed-off-by: Fabian Groffen  gentoo.org>

 travis/main.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/travis/main.sh b/travis/main.sh
index 7749a0a..bfb7aae 100755
--- a/travis/main.sh
+++ b/travis/main.sh
@@ -35,7 +35,7 @@ main() {
v ./configure --disable-maintainer-mode --disable-openmp
 
# Standard optimized build.
-   m
+   m V=1
m check
 
# LSan needs sudo, which we don't use at the moment



[gentoo-commits] proj/portage-utils:master commit in: travis/

2019-05-21 Thread Fabian Groffen
commit: ea0aae92fe4e454442f2833f9e7f6bb2f5767c15
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue May 21 14:32:04 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue May 21 14:32:04 2019 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=ea0aae92

travis: fix Clang build, attempt 2 at libb2

Signed-off-by: Fabian Groffen  gentoo.org>

 travis/install-blake2.sh | 2 +-
 travis/main.sh   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/travis/install-blake2.sh b/travis/install-blake2.sh
index 1ee6f1e..36989d8 100755
--- a/travis/install-blake2.sh
+++ b/travis/install-blake2.sh
@@ -19,7 +19,7 @@ main() {
--libdir=/ \
--includedir=/
m
-   m DESTDIR=../../sysroot install
+   m DESTDIR="${PWD}/../../sysroot" install
)
v rm -rf libb2*
travis_fold end dep-blake2

diff --git a/travis/main.sh b/travis/main.sh
index cf68cc9..7749a0a 100755
--- a/travis/main.sh
+++ b/travis/main.sh
@@ -31,7 +31,8 @@ main() {
export LDFLAGS="-L${PWD}/../sysroot"
 
# ignore timestamps which git doesn't preserve
-   v ./configure --disable-maintainer-mode
+   # disable openmp because Clang's libomp isn't installed
+   v ./configure --disable-maintainer-mode --disable-openmp
 
# Standard optimized build.
m



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

2019-05-21 Thread Fabian Groffen
commit: a2d1f0c672088831531c92508f8e4bf6a3e6480c
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue May 21 14:28:11 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue May 21 14:28:11 2019 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=a2d1f0c6

travis: attempt to install blake2

Signed-off-by: Fabian Groffen  gentoo.org>

 .travis.yml  |  1 +
 travis/install-blake2.sh | 27 +++
 2 files changed, 28 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index fb4c521..5e788a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,4 +24,5 @@ addons:
 
 before_install:
   - ./travis/install-iniparser.sh
+  - ./travis/install-blake2.sh
 script: ./travis/main.sh

diff --git a/travis/install-blake2.sh b/travis/install-blake2.sh
new file mode 100755
index 000..1ee6f1e
--- /dev/null
+++ b/travis/install-blake2.sh
@@ -0,0 +1,27 @@
+#!/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 \
+   --prefix=/ \
+   --libdir=/ \
+   --includedir=/
+   m
+   m DESTDIR=../../sysroot install
+   )
+   v rm -rf libb2*
+   travis_fold end dep-blake2
+}
+main "$@"



[gentoo-commits] proj/portage-utils:master commit in: travis/

2019-03-19 Thread Fabian Groffen
commit: bc2883499918e2f6cde31eaf17ed3c46c61d6453
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Mar 19 19:08:18 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Mar 19 19:08:18 2019 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=bc288349

travis: touch files in order not to trigger autoreconf

Signed-off-by: Fabian Groffen  gentoo.org>

 travis/main.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/travis/main.sh b/travis/main.sh
index bf1c01f..1cf62b9 100755
--- a/travis/main.sh
+++ b/travis/main.sh
@@ -30,6 +30,8 @@ main() {
export CPPFLAGS="-I${PWD}/../sysroot"
export LDFLAGS="-L${PWD}/../sysroot"
 
+   # get timestamps in order
+   v touch configure.ac Makefile.am aclocal.m4 configure Makefile.in 
config.h.in
v ./configure
 
# Standard optimized build.



[gentoo-commits] proj/portage-utils:master commit in: travis/

2018-03-30 Thread Fabian Groffen
commit: faf2859213a171f667a1b9a31e79ee1a4216d536
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Mar 30 06:54:47 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Mar 30 06:54:47 2018 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=faf28592

travis: disable LSan run, it requires sudo

 travis/main.sh | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/travis/main.sh b/travis/main.sh
index a076957..05c71eb 100755
--- a/travis/main.sh
+++ b/travis/main.sh
@@ -34,11 +34,10 @@ main() {
m
m check
 
+   # LSan needs sudo, which we don't use at the moment
# Debug build w/ASAN and such enabled.
-   export LSAN_OPTIONS=verbosity=1:log_threads=1
-   m debug
-   m check
-   unset LSAN_OPTIONS
+   #m debug
+   #m check
 
# Do scans last as they like to dirty the tree and some tests
# expect a clean tree (like code style checks).



[gentoo-commits] proj/portage-utils:master commit in: travis/

2018-03-30 Thread Fabian Groffen
commit: f261d54edff92f3e54e75d7a3349050de8d7e441
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Mar 30 06:40:05 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Mar 30 06:40:05 2018 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=f261d54e

travis: try to get some hints from sanitisers

 travis/main.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/travis/main.sh b/travis/main.sh
index 75daa0b..4e8fdae 100755
--- a/travis/main.sh
+++ b/travis/main.sh
@@ -36,7 +36,7 @@ main() {
 
# Debug build w/ASAN and such enabled.
m debug
-   m check
+   m check LSAN_OPTIONS=verbosity=1:log_threads=1
 
# Do scans last as they like to dirty the tree and some tests
# expect a clean tree (like code style checks).



[gentoo-commits] proj/portage-utils:master commit in: travis/

2018-03-30 Thread Fabian Groffen
commit: fbc80ef1b61804e6424f304109af96b0b59bfef7
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Mar 30 06:47:34 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Mar 30 06:47:34 2018 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=fbc80ef1

travis: 2nd try to get more verbosity

 travis/main.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/travis/main.sh b/travis/main.sh
index 4e8fdae..a076957 100755
--- a/travis/main.sh
+++ b/travis/main.sh
@@ -35,8 +35,10 @@ main() {
m check
 
# Debug build w/ASAN and such enabled.
+   export LSAN_OPTIONS=verbosity=1:log_threads=1
m debug
-   m check LSAN_OPTIONS=verbosity=1:log_threads=1
+   m check
+   unset LSAN_OPTIONS
 
# Do scans last as they like to dirty the tree and some tests
# expect a clean tree (like code style checks).



[gentoo-commits] proj/portage-utils:master commit in: travis/

2016-06-24 Thread Mike Frysinger
commit: d088ba735ae7f787f2d75200a357924ba219e1e1
Author: Mike Frysinger  gentoo  org>
AuthorDate: Fri Jun 24 09:09:04 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Fri Jun 24 09:09:04 2016 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=d088ba73

travis: note misbehavior by coverity addon when throttled

Example here: https://travis-ci.org/libgd/libgd/builds/139971212
The last line in the log is just the throttle notice.

 travis/main.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/travis/main.sh b/travis/main.sh
index 7831298..75daa0b 100755
--- a/travis/main.sh
+++ b/travis/main.sh
@@ -4,6 +4,8 @@
 
 # We have to do this by hand rather than use the coverity addon because of
 # matrix explosion: https://github.com/travis-ci/travis-ci/issues/1975
+# We also do it by hand because when we're throttled, the addon will exit
+# the build immediately and skip the main script!
 coverity_scan() {
local reason
[[ ${TRAVIS_JOB_NUMBER} != *.1 ]] && reason="not first build job"



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

2016-06-19 Thread Mike Frysinger
commit: 00090c9639522b484a4f8c3cf9b9fcb2f7ad6a5c
Author: Mike Frysinger  gentoo  org>
AuthorDate: Mon Jun 20 03:12:05 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Mon Jun 20 03:12:05 2016 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=00090c96

travis: add coverity scan integration

 .travis.yml|  9 -
 travis/main.sh | 25 +
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 015172e..fb4c521 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,15 +2,22 @@
 # https://docs.travis-ci.com/
 
 language: c
+# Order here matters for implicit matrix generation and coverity scan.
+# See travis/main.sh for details.
 compiler:
-  - clang
   - gcc
+  - clang
 
 sudo: false
 
+# Order here matters; see compiler comment above.
 os:
   - linux
 
+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:

diff --git a/travis/main.sh b/travis/main.sh
index e333685..7831298 100755
--- a/travis/main.sh
+++ b/travis/main.sh
@@ -2,6 +2,27 @@
 
 . "${0%/*}"/lib.sh
 
+# We have to do this by hand rather than use the coverity addon because of
+# matrix explosion: https://github.com/travis-ci/travis-ci/issues/1975
+coverity_scan() {
+   local reason
+   [[ ${TRAVIS_JOB_NUMBER} != *.1 ]] && reason="not first build job"
+   [[ -n ${TRAVIS_TAG} ]] && reason="git tag"
+   [[ ${TRAVIS_PULL_REQUEST} == "true" ]] && reason="pull request"
+   if [[ -n ${reason} ]] ; then
+   echo "Skipping coverity scan due to: ${reason}"
+   return
+   fi
+
+   export COVERITY_SCAN_PROJECT_NAME="${TRAVIS_REPO_SLUG}"
+   export COVERITY_SCAN_NOTIFICATION_EMAIL="vap...@gentoo.org"
+   export COVERITY_SCAN_BUILD_COMMAND="make -j${ncpus}"
+   export COVERITY_SCAN_BUILD_COMMAND_PREPEND="git clean -q -x -d -f; git 
checkout -f"
+   export COVERITY_SCAN_BRANCH_PATTERN="master"
+
+   curl -s 
"https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh; | bash || :
+}
+
 main() {
# For local deps like iniparser.
export CPPFLAGS="-I${PWD}/../sysroot"
@@ -14,5 +35,9 @@ main() {
# Debug build w/ASAN and such enabled.
m debug
m check
+
+   # Do scans last as they like to dirty the tree and some tests
+   # expect a clean tree (like code style checks).
+   v --fold="coverity_scan" coverity_scan
 }
 main "$@"