diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-11-27 00:36:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-27 00:36:52 +0100 |
| commit | 968b06fbb6cb96e8e4400d9c93c6778eaccb96fa (patch) | |
| tree | e180af0c297f26215ce4fd45248626a11cbc48e5 /travis | |
| parent | 74944e3af4278b52a5eef5c4ed17fd04558fb805 (diff) | |
| parent | f0842bb0b079801d9457579013e8aea5616d5f77 (diff) | |
| download | PROJ-968b06fbb6cb96e8e4400d9c93c6778eaccb96fa.tar.gz PROJ-968b06fbb6cb96e8e4400d9c93c6778eaccb96fa.zip | |
Merge pull request #2457 from rouault/gha_linux_clang
Move linux_clang Travis-CI job to Github action
Diffstat (limited to 'travis')
| -rwxr-xr-x | travis/install.sh | 5 | ||||
| -rwxr-xr-x | travis/linux_clang/after_success.sh | 5 | ||||
| -rwxr-xr-x | travis/linux_clang/before_install.sh | 8 | ||||
| -rwxr-xr-x | travis/linux_clang/install.sh | 9 |
4 files changed, 3 insertions, 24 deletions
diff --git a/travis/install.sh b/travis/install.sh index 8897f823..a4d8352a 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -41,8 +41,9 @@ make >/dev/null if [ "$(uname)" == "Linux" -a -f src/.libs/libproj.so ]; then if objdump -TC "src/.libs/libproj.so" | grep "elf64-x86-64">/dev/null; then echo "Checking exported symbols..." - $TRAVIS_BUILD_DIR/scripts/dump_exported_symbols.sh src/.libs/libproj.so > /tmp/got_symbols.txt - diff -u $TRAVIS_BUILD_DIR/scripts/reference_exported_symbols.txt /tmp/got_symbols.txt || (echo "Difference(s) found in exported symbols. If intended, refresh scripts/reference_exported_symbols.txt with 'scripts/dump_exported_symbols.sh src/.libs/libproj.so > scripts/reference_exported_symbols.txt'"; exit 1) + cat $TRAVIS_BUILD_DIR/scripts/reference_exported_symbols.txt | sort > /tmp/reference_exported_symbols.txt + $TRAVIS_BUILD_DIR/scripts/dump_exported_symbols.sh src/.libs/libproj.so | sort > /tmp/got_symbols.txt + diff -u /tmp/reference_exported_symbols.txt /tmp/got_symbols.txt || (echo "Difference(s) found in exported symbols. If intended, refresh scripts/reference_exported_symbols.txt with 'scripts/dump_exported_symbols.sh src/.libs/libproj.so > scripts/reference_exported_symbols.txt'"; exit 1) fi fi diff --git a/travis/linux_clang/after_success.sh b/travis/linux_clang/after_success.sh deleted file mode 100755 index 9618f673..00000000 --- a/travis/linux_clang/after_success.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -e - -# nothing diff --git a/travis/linux_clang/before_install.sh b/travis/linux_clang/before_install.sh deleted file mode 100755 index c4b8acad..00000000 --- a/travis/linux_clang/before_install.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -set -e - -./travis/before_install_apt.sh -./travis/before_install_pip.sh - -sudo apt-get install -qq sqlite3 libsqlite3-dev libtiff-dev libcurl4-openssl-dev diff --git a/travis/linux_clang/install.sh b/travis/linux_clang/install.sh deleted file mode 100755 index 50c02882..00000000 --- a/travis/linux_clang/install.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -set -e - -export CCACHE_CPP2=yes -export PROJ_DB_CACHE_DIR="$HOME/.ccache" - -# -fno-use-cxa-atexit is needed to build with -coverage -CC="ccache clang" CXX="ccache clang++" CFLAGS="-Werror -fsanitize=address -fno-use-cxa-atexit" CXXFLAGS="-Werror -fsanitize=address -fno-use-cxa-atexit" LDFLAGS="-fsanitize=address" ./travis/install.sh |