Skip to contentSkip to conversation

Remove old Travis CI related files

PATCH In review Frank Lichtenheld 2 participants 2 messages Jul 7, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Remove old Travis CI related files

They are not used or mainained anymore. So just remove them.

Change-Id I704f7c9a9fe9a2b988410c4586183302392e690d
---
 .travis.yml            | 126 ------------------------------
 .travis/build-check.sh |  32 --------
 .travis/build-deps.sh  | 170 -----------------------------------------
 .travis/coverity.sh    |  17 -----
 4 files changed, 345 deletions(-)
 delete mode 100644 .travis.yml
 delete mode 100755 .travis/build-check.sh
 delete mode 100755 .travis/build-deps.sh
 delete mode 100755 .travis/coverity.sh
.travis.yml deleted +0 -126
deleted file mode 100644
index 2d379c70..00000000
@@ -1,126 +0,0 @@
-dist: bionic
-
-os: linux
-
-language: c
-
-env:
-  global:
-    - JOBS=3
-    - RUN_SUDO="false"
-    - PREFIX="${HOME}/opt"
-    - TAP_WINDOWS_VERSION=9.23.3
-    - LZO_VERSION=2.10
-    - PKCS11_HELPER_VERSION=1.26
-    - MBEDTLS_VERSION=2.16.4
-    - MBEDTLS_CFLAGS="-I${PREFIX}/include"
-    - MBEDTLS_LIBS="-L${PREFIX}/lib -lmbedtls -lmbedx509 -lmbedcrypto"
-    - OPENSSL_VERSION=1.0.2u
-    - OPENSSL_CFLAGS="-I${PREFIX}/include"
-    - OPENSSL_LIBS="-L${PREFIX}/lib -lssl -lcrypto"
-    # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
-    #   via the "travis encrypt" command using the project repo's public key
-    - secure: "l9mSnEW4LJqjxftH5i1NdDaYfGmQB1mPXnSB3DXnsjzkCWZ+yJLfBemfQ0tx/wS7chBYxqUaUIMT0hw4zJVp/LANFJo2vfh//ymTS6h0uApRY1ofg9Pp1BFcV1laG6/u8pwSZ2EBy/GhCd3DS436oE8sYBRaFM9FU62L/oeQBfJ7r4ID/0eB1b8bqlbD4paty9MHui2P8EZJwR+KAD84prtfpZOcrSMxPh9OUhJxzxUvvVoP4s4+lZ5Kgg1bBQ3yzKGDqe8VOgK2BWCEuezqhMMc8oeKmAe7CUkoz5gsGYH++k3I9XzP9Z4xeJKoQnC/82qi4xkJmlaOxdionej9bHIcjfRt7D8j1J0U+wOj4p8VrDy7yHaxuN2fi0K5MGa/CaXQSrkna8dePniCng+xQ2MY/zxuRX2gA6xPNLUyQLU9LqIug7wj4z84Hk9iWib4L20MoPjeEo+vAUNq8FtjOPxMuHNpv4iGGx6kgJm7RXl5vC5hxfK6MprrnYe2U5Mcd8jpzagKBaKHL3zV2FxX9k0jRO9Mccz7M2WnaV0MQ6zcngzTN4+s0kCjhfGKd2F2ANT2Gkhj3Me36eNHfuE0dBbvYCMh4b3Mgd7b/OuXwQWdJ8PjJ1WHXjSOw5sHw1suaV6cEO2Meyz5j1tOkyOi0M9QF+LFenQ9vLH4sBCww8U="
-
-jobs:
-  include:
-    - name: cl
-      env:
-      - SSLLIB="openssl"
-      - OPENSSL_VERSION="1.1.1d"
-      - P7Z="c:\Program Files\7-Zip\7z.exe"
-      - CC="cl"
-      os: windows
-      compiler: cl
-    - name: Coverity scan
-      env: SSLLIB="openssl" RUN_COVERITY="1"
-      os: linux
-      compiler: gcc
-    - name: gcc | openssl-1.1.1d
-      env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d"
-      os: linux
-      arch: amd64
-      compiler: gcc
-    - name: gcc | openssl-1.1.1d
-      env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d"
-      os: linux
-      arch: ppc64le
-      compiler: gcc
-    - name: gcc | openssl-1.1.1d
-      env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d"
-      os: linux
-      arch: arm64
-      compiler: gcc
-    - name: gcc | openssl-1.1.1d
-      env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d"
-      os: linux
-      arch: s390x
-      compiler: gcc
-    - name: gcc | openssl-1.0.2u | iproute2
-      env: SSLLIB="openssl" EXTRA_CONFIG="--enable-iproute2"
-      os: linux
-      compiler: gcc
-    - name: clang+asan | openssl-1.0.2u
-      env: SSLLIB="openssl" CFLAGS="-fsanitize=address" CC=clang-9
-      os: linux
-      compiler: clang
-    - name: clang | openssl-1.1.1d
-      env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d" CC=clang-9
-      os: linux
-      compiler: clang
-    - name: gcc | mbedtls
-      env: SSLLIB="mbedtls"
-      os: linux
-      compiler: gcc
-    - name: clang+asan | mbedtls
-      env: SSLLIB="mbedtls" CFLAGS="-fsanitize=address" CC=clang-9
-      os: linux
-      compiler: clang
-    - name: clang | openssl-1.0.2u
-      env: SSLLIB="openssl"
-      os: osx
-      compiler: clang
-    - name: clang | mbedtls
-      env: SSLLIB="mbedtls"
-      os: osx
-      compiler: clang
-    - name: mingw64 | openssl-1.1.1d
-      env: SSLLIB="openssl" CHOST=x86_64-w64-mingw32 OPENSSL_VERSION="1.1.1d"
-      os: linux
-      compiler: ": Win64 build only"
-    - name: mingw32 | openssl-1.0.2u
-      env: SSLLIB="openssl" CHOST=i686-w64-mingw32
-      os: linux
-      compiler: ": Win32 build only"
-    - name: clang | openssl-1.0.2u | disable-lzo | distcheck
-      env: SSLLIB="openssl" EXTRA_CONFIG="--disable-lzo" EXTRA_SCRIPT="make distcheck" CC=clang-9
-      os: linux
-      compiler: clang
-    - name: clang | openssl-1.0.2u | enable-small
-      env: SSLLIB="openssl" EXTRA_CONFIG="--enable-small" CC=clang-9
-      os: linux
-      compiler: clang
-
-addons:
-  apt:
-    update: true
-    packages: [ liblzo2-dev, libpam0g-dev, liblz4-dev, linux-libc-dev, man2html, mingw-w64, clang-9, libcmocka-dev, python3-docutils ]
-  homebrew:
-    update: true
-    packages: [ lzo, lz4, cmocka ]
-
-cache:
-  directories:
-  - download-cache
-  - ${HOME}/opt
-  - ${HOME}/Library/Caches/Homebrew
-
-install:
-  - if [ ! -z "${CHOST}" ]; then unset CC; fi
-  - travis_wait 30 bash -c '.travis/build-deps.sh > build-deps.log 2>&1' || (cat build-deps.log && exit 1)
-
-before_script:
-  - .travis/coverity.sh
-
-script:
-  - .travis/build-check.sh
.travis/build-check.sh deleted +0 -32
deleted file mode 100755
index 4e1b7243..00000000
@@ -1,32 +0,0 @@
-#!/bin/sh
-set -eux
-
-if [ "${TRAVIS_OS_NAME}" = "windows" ]; then
-	PATH="/c/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/MSBuild/Current/Bin/":$PATH
-	MSBuild.exe openvpn.sln //p:Platform=x64 && exit 0
-fi
-
-autoreconf -vi
-
-if [ -z ${CHOST+x} ]; then
-	if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
-		export EXTRA_CONFIG="${EXTRA_CONFIG:-} --enable-werror"
-	fi
-	./configure --with-crypto-library="${SSLLIB}" ${EXTRA_CONFIG:-} || (cat config.log && exit 1)
-	make LDFLAGS="-Wl,-rpath,${PREFIX}/lib" -j$JOBS
-	src/openvpn/openvpn --version || true
-	if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
-		ldd src/openvpn/openvpn;
-	fi
-	if [ "${TRAVIS_OS_NAME}" = "osx" ]; then otool -L src/openvpn/openvpn; fi
-	make check
-	${EXTRA_SCRIPT:-}
-else
-	export TAP_CFLAGS="-I${PWD}/tap-windows-${TAP_WINDOWS_VERSION}/include"
-	export LZO_CFLAGS="-I${PREFIX}/include"
-	export LZO_LIBS="-L${PREFIX}/lib -llzo2"
-	export PKCS11_HELPER_LIBS="-L${PREFIX}/lib -lpkcs11-helper"
-	export PKCS11_HELPER_CFLAGS="-I${PREFIX}/include"
-	./configure --with-crypto-library="${SSLLIB}" --host=${CHOST} --build=x86_64-pc-linux-gnu --enable-pkcs11 --disable-plugins || (cat config.log && exit 1)
-	make -j${JOBS}
-fi
.travis/build-deps.sh deleted +0 -170

170 lines not on this page · raw message

.travis/coverity.sh deleted +0 -17
deleted file mode 100755
index 8bb40f48..00000000
@@ -1,17 +0,0 @@
-#!/bin/sh
-set -eu
-
-RUN_COVERITY="${RUN_COVERITY:-0}"
-
-export COVERITY_SCAN_PROJECT_NAME="OpenVPN/openvpn"
-export COVERITY_SCAN_BRANCH_PATTERN="release\/2.4"
-export COVERITY_SCAN_NOTIFICATION_EMAIL="[email protected]..."
-export COVERITY_SCAN_BUILD_COMMAND_PREPEND="autoreconf -vi && ./configure --enable-iproute2 && make clean"
-export COVERITY_SCAN_BUILD_COMMAND="make"
-
-if [ "${RUN_COVERITY}" = "1" ]; then
-    # Ignore exit code, script exits with 1 if we're not on the right branch
-    curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash || true
-else
-    echo "Skipping coverity scan because \$RUN_COVERITY != \"1\""
-fi
Signature · 1 line
2.34.1
Acked-by on v1 1/1
#1 lore raw

Trivial, and makes sense.

Since this does not touch source files, haven't tested anything (it does bring up the question "can we get coverity scans up and running again, somehow?").

Your patch has been applied to the master and release/2.6 branch.

commit fd43636c417b479e95ca9f3eca6b90c410bc7686 (master) commit c5d31ddead4ce12903fb36cbf8b154afbd2aa7f1 (release/2.6)

Author: Frank Lichtenheld
Date:   Fri Jul 7 16:46:28 2023 +0200
     Remove old Travis CI related files

     Signed-off-by: Frank Lichtenheld <[email protected]...>
     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg26834.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering