AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-22 17:39:53 +03:00
Code Releases Activity

Merge pull request #1225 from chipitsine/master

Browse Source 
travis-ci: do not use aggressive LD_LIBRARY_PATH anymore
This commit is contained in:
Ilya Shipitsin 2020-10-11 15:38:45 +03:00 committed by GitHub
commit 8bb787f233
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -35,10 +35,8 @@ matrix:
- | - |
if [ ! -z ${COVERITY_SCAN_TOKEN+x} ]; then if [ ! -z ${COVERITY_SCAN_TOKEN+x} ]; then
export OPENSSL_ROOT_DIR=${OPENSSL_INSTALL_DIR} export OPENSSL_ROOT_DIR=${OPENSSL_INSTALL_DIR}
export LD_LIBRARY_PATH="${HOME}/opt/lib:${LD_LIBRARY_PATH:-}"
export CFLAGS="-I${HOME}/opt/include" export CFLAGS="-I${HOME}/opt/include"
export LDFLAGS="-L${HOME}/opt/lib" export LDFLAGS="-L${HOME}/opt/lib -Wl,-rpath,${HOME}/opt/lib"
echo "check_certificate = off" > ~/.wgetrc
curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash || true curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash || true
fi fi
- env: OPENSSL_VERSION="1.1.1c" - env: OPENSSL_VERSION="1.1.1c"
@ -79,10 +77,8 @@ before_install:
script: script:
- export OPENSSL_ROOT_DIR=${OPENSSL_INSTALL_DIR} - export OPENSSL_ROOT_DIR=${OPENSSL_INSTALL_DIR}
- export LD_LIBRARY_PATH="${HOME}/opt/lib:${LD_LIBRARY_PATH:-}"
- export CFLAGS="-I${HOME}/opt/include" - export CFLAGS="-I${HOME}/opt/include"
- export LDFLAGS="-L${HOME}/opt/lib" - export LDFLAGS="-L${HOME}/opt/lib -Wl,-rpath,${HOME}/opt/lib"
- echo "check_certificate = off" > ~/.wgetrc
- .ci/sonarcloud.sh - .ci/sonarcloud.sh
- ./configure - ./configure
- make -j $(nproc || sysctl -n hw.ncpu || echo 4) -C build - make -j $(nproc || sysctl -n hw.ncpu || echo 4) -C build