[geos-commits] [SCM] GEOS branch master updated. 7ad488a7334552dae774d1130559c46a921efc02

git at osgeo.org git at osgeo.org
Tue Feb 25 06:49:47 PST 2020


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".

The branch, master has been updated
       via  7ad488a7334552dae774d1130559c46a921efc02 (commit)
       via  3770e50556f375eea60b8cc81681592121e47f29 (commit)
      from  f5131cf06e2204de0176fae7fe2245548cad04ad (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7ad488a7334552dae774d1130559c46a921efc02
Author: Raúl Marín <git at rmr.ninja>
Date:   Fri Feb 21 16:14:33 2020 +0100

    Update scanbuild job to clang 9

diff --git a/.travis.yml b/.travis.yml
index d5b7ce7..682461e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -110,8 +110,11 @@ matrix:
           - $HOME/.ccache
       addons:
         apt:
-          sources: *sources
-          packages: ['clang','ccache','doxygen']
+          sources:
+            - ubuntu-toolchain-r-test
+            - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main'
+              key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
+          packages: ['clang-9', 'clang-tools-9', 'ccache','doxygen']
       env:
         - E="TOOL=autotools_scanbuild && BUILD_TYPE=Release && ARCH=-m64"
 
diff --git a/tools/ci/script_autotools_scanbuild.sh b/tools/ci/script_autotools_scanbuild.sh
index 3cbb8bb..5cd40d8 100755
--- a/tools/ci/script_autotools_scanbuild.sh
+++ b/tools/ci/script_autotools_scanbuild.sh
@@ -21,5 +21,5 @@ fi
 cd ${TRAVIS_BUILD_DIR}
 ./autogen.sh
 cd -
-${TRAVIS_BUILD_DIR}/configure CC=clang CXX=clang++ CXXFLAGS="-std=c++11"
-scan-build --status-bugs make -j2
+scan-build ${TRAVIS_BUILD_DIR}/configure CC=clang-9 CXX=clang++-9 CXXFLAGS="-std=c++11"
+scan-build --keep-cc --status-bugs make -j2

commit 3770e50556f375eea60b8cc81681592121e47f29
Author: Raúl Marín <git at rmr.ninja>
Date:   Fri Feb 21 15:27:31 2020 +0100

    Re-enable Travis scan-build job
    
    This reverts commit e4501a221faffbc3294cecda7a170445312476f7.
    
    Adds the job as allow_failures so it's available as part of the CI

diff --git a/.travis.yml b/.travis.yml
index e3f609c..d5b7ce7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -103,17 +103,20 @@ matrix:
       env:
         - E="TOOL=cmake && BUILD_TYPE=Release && CXX=clang++ && ARCH=-m64 && CC=clang"
 
-#    - os: linux
-#      cache:
-#        apt: true
-#        directories:
-#          - $HOME/.ccache
-#      addons:
-#        apt:
-#          sources: *sources
-#          packages: ['clang','ccache','doxygen']
-#      env:
-#        - E="TOOL=autotools_scanbuild && BUILD_TYPE=Release && ARCH=-m64
+    - os: linux
+      cache:
+        apt: true
+        directories:
+          - $HOME/.ccache
+      addons:
+        apt:
+          sources: *sources
+          packages: ['clang','ccache','doxygen']
+      env:
+        - E="TOOL=autotools_scanbuild && BUILD_TYPE=Release && ARCH=-m64"
+
+  allow_failures:
+    - env: E="TOOL=autotools_scanbuild && BUILD_TYPE=Release && ARCH=-m64"
 
 before_install:
   - eval "${E}"
diff --git a/tools/ci/script_autotools_scanbuild.sh b/tools/ci/script_autotools_scanbuild.sh
index 1216cb7..3cbb8bb 100755
--- a/tools/ci/script_autotools_scanbuild.sh
+++ b/tools/ci/script_autotools_scanbuild.sh
@@ -21,5 +21,5 @@ fi
 cd ${TRAVIS_BUILD_DIR}
 ./autogen.sh
 cd -
-${TRAVIS_BUILD_DIR}/configure CC=clang CXX=clang++
+${TRAVIS_BUILD_DIR}/configure CC=clang CXX=clang++ CXXFLAGS="-std=c++11"
 scan-build --status-bugs make -j2

-----------------------------------------------------------------------

Summary of changes:
 .travis.yml                            | 28 +++++++++++++++++-----------
 tools/ci/script_autotools_scanbuild.sh |  4 ++--
 2 files changed, 19 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
GEOS


More information about the geos-commits mailing list