From 126ed2fb8326d745dcc2e17d39ea13f0663909ac Mon Sep 17 00:00:00 2001 From: Yury Date: Thu, 16 Apr 2020 10:48:20 +0500 Subject: [PATCH 01/13] initial attempt to integrate travis CI --- .travis.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..f3ba595 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,24 @@ +language: cpp +sudo: required +dist: bionic +os: + - linux +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++8 + env: + - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" + +before_install: + - echo $LANG + - echo $LC_ALL + - gcc-8 -v + - git submodule update --init --recursive + - sudo apt-get install libevent -y +script: + - mkdir build && cd build + - cmake -DCMAKE_CXX_COMPILER=g++-8 -DCMAKE_CC_COMPILER=gcc-8 ../ + - make -j$(nproc) \ No newline at end of file From 6cbb8c0ac2e931056bf50982f6309eddc24ddd5f Mon Sep 17 00:00:00 2001 From: Yury Date: Thu, 16 Apr 2020 10:58:47 +0500 Subject: [PATCH 02/13] space added --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f3ba595..7863f31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ addons: env: - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" + before_install: - echo $LANG - echo $LC_ALL From 0ef4712f811ffa7b006ae3c71914971923fae0f2 Mon Sep 17 00:00:00 2001 From: Yury Date: Thu, 16 Apr 2020 11:03:23 +0500 Subject: [PATCH 03/13] Another try to trigger build --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7863f31..f3ba595 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,6 @@ addons: env: - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" - before_install: - echo $LANG - echo $LC_ALL From c3fd2b16844e5b1e31442774c69ecd64b96b62ea Mon Sep 17 00:00:00 2001 From: Yury Date: Thu, 16 Apr 2020 11:13:31 +0500 Subject: [PATCH 04/13] test --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f3ba595..b5153e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,4 +21,4 @@ before_install: script: - mkdir build && cd build - cmake -DCMAKE_CXX_COMPILER=g++-8 -DCMAKE_CC_COMPILER=gcc-8 ../ - - make -j$(nproc) \ No newline at end of file + - make -j$(nproc) From 93d3e586d2767f9083f43cc99375212b746be4e6 Mon Sep 17 00:00:00 2001 From: Yury Date: Thu, 16 Apr 2020 11:20:14 +0500 Subject: [PATCH 05/13] test[2] --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b5153e5..f3ba595 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,4 +21,4 @@ before_install: script: - mkdir build && cd build - cmake -DCMAKE_CXX_COMPILER=g++-8 -DCMAKE_CC_COMPILER=gcc-8 ../ - - make -j$(nproc) + - make -j$(nproc) \ No newline at end of file From a68f44118ad798bff19795de9da1c5baafe9155b Mon Sep 17 00:00:00 2001 From: Yury Date: Thu, 16 Apr 2020 11:26:07 +0500 Subject: [PATCH 06/13] little changes --- .travis.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index f3ba595..8dec1df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,11 @@ language: cpp -sudo: required dist: bionic os: - linux -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++8 - env: - - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" before_install: + - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y + - sudo apt-get install gcc-8 g++-8 -y - echo $LANG - echo $LC_ALL - gcc-8 -v From 701dc19dff753c02c52cfe724b8e2f5582eac2f7 Mon Sep 17 00:00:00 2001 From: Yury Date: Thu, 16 Apr 2020 11:46:56 +0500 Subject: [PATCH 07/13] submodule loading workaround --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8dec1df..ee172b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,14 +2,17 @@ language: cpp dist: bionic os: - linux +git: + submodules: false before_install: + - sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules + - git submodule update --init --recursive - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - sudo apt-get install gcc-8 g++-8 -y - echo $LANG - echo $LC_ALL - gcc-8 -v - - git submodule update --init --recursive - sudo apt-get install libevent -y script: - mkdir build && cd build From eb81474b999531c5e2d62523ddb89dfb96abdabc Mon Sep 17 00:00:00 2001 From: Yury Date: Thu, 16 Apr 2020 11:50:44 +0500 Subject: [PATCH 08/13] libevent installation removed --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ee172b9..6d4251c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,6 @@ before_install: - echo $LANG - echo $LC_ALL - gcc-8 -v - - sudo apt-get install libevent -y script: - mkdir build && cd build - cmake -DCMAKE_CXX_COMPILER=g++-8 -DCMAKE_CC_COMPILER=gcc-8 ../ From 76e6c9bee2aabd23692018ee1591e017fac4ffe5 Mon Sep 17 00:00:00 2001 From: Yury Date: Thu, 16 Apr 2020 11:53:21 +0500 Subject: [PATCH 09/13] changing dir to src --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 6d4251c..1467f8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ before_install: - echo $LC_ALL - gcc-8 -v script: + - cd src - mkdir build && cd build - cmake -DCMAKE_CXX_COMPILER=g++-8 -DCMAKE_CC_COMPILER=gcc-8 ../ - make -j$(nproc) \ No newline at end of file From f4ec16817408f73c13e878b7b6b070ff6dc2028b Mon Sep 17 00:00:00 2001 From: Yury Date: Thu, 16 Apr 2020 14:45:51 +0500 Subject: [PATCH 10/13] Tracer submodule updated --- src/libratel/tracer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libratel/tracer b/src/libratel/tracer index 96f67fc..16a8869 160000 --- a/src/libratel/tracer +++ b/src/libratel/tracer @@ -1 +1 @@ -Subproject commit 96f67fc75dffeaa86071507e6c120fa49c38df7f +Subproject commit 16a88696d159b1117710300876b9a7952547be2a From b5cceffb5f08fbbfd5ef18c2281bf35b532c5395 Mon Sep 17 00:00:00 2001 From: Yury Date: Thu, 16 Apr 2020 14:49:23 +0500 Subject: [PATCH 11/13] libevent installing added back --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1467f8a..62dea1b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ before_install: - sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules - git submodule update --init --recursive - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - - sudo apt-get install gcc-8 g++-8 -y + - sudo apt-get install gcc-8 g++-8 libevent-dev -y - echo $LANG - echo $LC_ALL - gcc-8 -v From ae0d2859e17113e52b2907e4c2824c586b37b51a Mon Sep 17 00:00:00 2001 From: Yury Date: Thu, 16 Apr 2020 15:00:24 +0500 Subject: [PATCH 12/13] Testing check added --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 62dea1b..3994798 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,4 +17,5 @@ script: - cd src - mkdir build && cd build - cmake -DCMAKE_CXX_COMPILER=g++-8 -DCMAKE_CC_COMPILER=gcc-8 ../ - - make -j$(nproc) \ No newline at end of file + - make -j$(nproc) + - CTEST_OUTPUT_ON_FAILURE=1 ./socks5_proxyTest \ No newline at end of file From 24fe4235e42c09e7ea74612fb4ee9f2ae4dc8d60 Mon Sep 17 00:00:00 2001 From: Yury Date: Fri, 17 Apr 2020 12:12:59 +0500 Subject: [PATCH 13/13] Excess enviroment variable removed --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3994798..17c65c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,4 +18,4 @@ script: - mkdir build && cd build - cmake -DCMAKE_CXX_COMPILER=g++-8 -DCMAKE_CC_COMPILER=gcc-8 ../ - make -j$(nproc) - - CTEST_OUTPUT_ON_FAILURE=1 ./socks5_proxyTest \ No newline at end of file + - ./socks5_proxyTest \ No newline at end of file