From 18cbcc413586d9d5a2ccb34826eb0243d7b1f576 Mon Sep 17 00:00:00 2001
From: Niels Lohmann <mail@nlohmann.me>
Date: Mon, 11 May 2020 12:25:41 +0200
Subject: [PATCH 1/7] :alembic: try to fix SSL issue
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index acd542ba..3a3265fa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -100,7 +100,7 @@ matrix:
sources: ['ubuntu-toolchain-r-test']
packages: ['g++-4.9', 'ninja-build']
before_script:
- - pip install --user cpp-coveralls
+ - pip install --user requests[security] cpp-coveralls
after_success:
- coveralls --build-root test --include include/nlohmann --gcov 'gcov-4.9' --gcov-options '\-lp'
env:
From 697305819f6a74c2116b5dc8592e611fcbc820fa Mon Sep 17 00:00:00 2001
From: Niels Lohmann <mail@nlohmann.me>
Date: Mon, 11 May 2020 12:37:24 +0200
Subject: [PATCH 2/7] :alembic: try to fix SSL issue
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 3a3265fa..7cc13e93 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -100,7 +100,7 @@ matrix:
sources: ['ubuntu-toolchain-r-test']
packages: ['g++-4.9', 'ninja-build']
before_script:
- - pip install --user requests[security] cpp-coveralls
+ - pip install --user httplib2 cpp-coveralls
after_success:
- coveralls --build-root test --include include/nlohmann --gcov 'gcov-4.9' --gcov-options '\-lp'
env:
From 19b21e61e572de499e7f0725602ca65ffb55ddde Mon Sep 17 00:00:00 2001
From: Niels Lohmann <mail@nlohmann.me>
Date: Mon, 11 May 2020 13:05:53 +0200
Subject: [PATCH 3/7] :alembic: try to fix SSL issue
---
.travis.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 7cc13e93..6eae6e4b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -100,7 +100,8 @@ matrix:
sources: ['ubuntu-toolchain-r-test']
packages: ['g++-4.9', 'ninja-build']
before_script:
- - pip install --user httplib2 cpp-coveralls
+ - pip install --user urllib3[secure]
+ - pip install --user cpp-coveralls
after_success:
- coveralls --build-root test --include include/nlohmann --gcov 'gcov-4.9' --gcov-options '\-lp'
env:
From 8389c1961b9f92ff8a5de017c10bfb8ff1dc1efd Mon Sep 17 00:00:00 2001
From: Niels Lohmann <mail@nlohmann.me>
Date: Mon, 11 May 2020 13:19:22 +0200
Subject: [PATCH 4/7] :alembic: try to fix SSL issue
---
.travis.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.travis.yml b/.travis.yml
index 6eae6e4b..50f7d7b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -100,6 +100,7 @@ matrix:
sources: ['ubuntu-toolchain-r-test']
packages: ['g++-4.9', 'ninja-build']
before_script:
+ - pip install --upgrade pip
- pip install --user urllib3[secure]
- pip install --user cpp-coveralls
after_success:
From cbb2d4e4d8f0af4ffa6930c074ddf0be5333561d Mon Sep 17 00:00:00 2001
From: Niels Lohmann <mail@nlohmann.me>
Date: Mon, 11 May 2020 13:29:40 +0200
Subject: [PATCH 5/7] :alembic: try to fix SSL issue
---
.travis.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 50f7d7b1..aa34ef50 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -95,13 +95,12 @@ matrix:
- os: linux
compiler: gcc
+ dist: bionic
addons:
apt:
sources: ['ubuntu-toolchain-r-test']
packages: ['g++-4.9', 'ninja-build']
before_script:
- - pip install --upgrade pip
- - pip install --user urllib3[secure]
- pip install --user cpp-coveralls
after_success:
- coveralls --build-root test --include include/nlohmann --gcov 'gcov-4.9' --gcov-options '\-lp'
From 0ad595709d9a4e0cb608026c27d1b1cd021068c6 Mon Sep 17 00:00:00 2001
From: Niels Lohmann <mail@nlohmann.me>
Date: Mon, 11 May 2020 13:40:43 +0200
Subject: [PATCH 6/7] :alembic: try to fix SSL issue
---
.travis.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index aa34ef50..e3dd7353 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -99,11 +99,11 @@ matrix:
addons:
apt:
sources: ['ubuntu-toolchain-r-test']
- packages: ['g++-4.9', 'ninja-build']
+ packages: ['g++-7', 'ninja-build']
before_script:
- pip install --user cpp-coveralls
after_success:
- - coveralls --build-root test --include include/nlohmann --gcov 'gcov-4.9' --gcov-options '\-lp'
+ - coveralls --build-root test --include include/nlohmann --gcov 'gcov-7' --gcov-options '\-lp'
env:
- COMPILER=g++-4.9
- CMAKE_OPTIONS=-DJSON_Coverage=ON
From 66dfa22de25aefe7a90a58c1d01a2d7d9c3fd48b Mon Sep 17 00:00:00 2001
From: Niels Lohmann <mail@nlohmann.me>
Date: Mon, 11 May 2020 14:24:38 +0200
Subject: [PATCH 7/7] :alembic: try to fix SSL issue
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index e3dd7353..3aea08ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -105,7 +105,7 @@ matrix:
after_success:
- coveralls --build-root test --include include/nlohmann --gcov 'gcov-7' --gcov-options '\-lp'
env:
- - COMPILER=g++-4.9
+ - COMPILER=g++-7
- CMAKE_OPTIONS=-DJSON_Coverage=ON
- MULTIPLE_HEADERS=ON