Hi, On Tue, Mar 19, 2019 at 01:18:37AM +0500, ???????? ?????????????? wrote: > can we apply it to 2.4 as well ? > ubuntu trusty is EOL soon
Steffan ACKed merging it into 2.4 as well. For brevity I squashed the
three commits to the same file into one, which is appended below.
gert
--
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh Mistress
Gert Doering - Munich, Germany g...@greenie.muc.de
From 6a5c9bb146061e3331a9000405c84150c8bad310 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin <chipits...@gmail.com> Date: Mon, 11 Mar 2019 18:36:18 +0500 Subject: [PATCH] travis-ci: add "linux-ppc64le" to build matrix, change trusty image to xenial, update osx to xcode9.4 and modernize brew management Signed-off-by: Ilya Shipitsin <chipits...@gmail.com> Acked-by: Steffan Karger <steffan.kar...@fox-it.com> Message-Id: <20190311133620.18278-2-chipits...@gmail.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg18271.html Signed-off-by: Gert Doering <g...@greenie.muc.de> (cherry picked from commit 27fb43da6f86eda7a6e5a033e060cab5be0cdbe9) Ubuntu Trusty reaches End of Life on April 30, 2019 Let us switch to xenial. Also, it simplifies mingw builds. We do not need to add xenial mingw manually anymore Signed-off-by: Ilya Shipitsin <chipits...@gmail.com> Acked-by: Steffan Karger <steffan.kar...@fox-it.com> Message-Id: <20190311133620.18278-3-chipits...@gmail.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg18270.html Signed-off-by: Gert Doering <g...@greenie.muc.de> (cherry picked from commit 4ca813798af89997441bc35723ed1995b6b269e1) osx image used for builds, i.e. xcode7.3 is outdated, we can switch to "default" xcode9.4 and use more fast brew travis-ci plugin Signed-off-by: Ilya Shipitsin <chipits...@gmail.com> Acked-by: Steffan Karger <steffan.kar...@fox-it.com> Message-Id: <20190311133620.18278-4-chipits...@gmail.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg18269.html Signed-off-by: Gert Doering <g...@greenie.muc.de> (cherry picked from commit 2cae16aae55dd1ef2ae41c36bec752db34ab4695) --- .travis.yml | 21 ++++++++------------- .travis/build-deps.sh | 9 --------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index 62587d28..d7aff06e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ sudo: required -dist: trusty +dist: xenial os: linux @@ -33,6 +33,9 @@ matrix: - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0f" os: linux compiler: gcc + - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.0h" LABEL="linux-ppc64le" + os: linux-ppc64le + compiler: gcc - env: SSLLIB="openssl" CFLAGS="-fsanitize=address" os: linux compiler: clang @@ -47,11 +50,9 @@ matrix: compiler: clang - env: SSLLIB="openssl" os: osx - osx_image: xcode7.3 compiler: clang - env: SSLLIB="mbedtls" os: osx - osx_image: xcode7.3 compiler: clang - env: SSLLIB="openssl" CHOST=x86_64-w64-mingw32 OPENSSL_VERSION="1.0.1u" os: linux @@ -76,12 +77,10 @@ matrix: addons: apt: - packages: - - liblzo2-dev - - libpam0g-dev - - liblz4-dev - - linux-libc-dev - - man2html + update: true + packages: [ liblzo2-dev, libpam0g-dev, liblz4-dev, linux-libc-dev, man2html, mingw-w64] + homebrew: + packages: [ lzo ] cache: directories: @@ -89,10 +88,6 @@ cache: - ${HOME}/opt - ${HOME}/Library/Caches/Homebrew -before_install: - - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew update ; fi - - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew install lzo; fi - install: - if [ ! -z "${CHOST}" ]; then unset CC; fi - .travis/build-deps.sh > build-deps.log 2>&1 || (cat build-deps.log && exit 1) diff --git a/.travis/build-deps.sh b/.travis/build-deps.sh index 96a030cc..391b35ef 100755 --- a/.travis/build-deps.sh +++ b/.travis/build-deps.sh @@ -130,15 +130,6 @@ build_openssl () { fi } -if [ ! -z ${CHOST+x} ]; then - # - # openvpn requires at least mingw-gcc-4.9, which is available at xenial repo - # - sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu xenial main universe" - sudo apt-get update - sudo apt-get -y install dpkg mingw-w64 -fi - # Download and build crypto lib if [ "${SSLLIB}" = "openssl" ]; then download_openssl -- 2.18.0
signature.asc
Description: PGP signature
_______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
