From 481b67e0289153858ea85a01a6279c0d9bda1bfa Mon Sep 17 00:00:00 2001 From: abitmore Date: Wed, 21 Jun 2023 17:45:53 +0000 Subject: [PATCH 1/3] Use ES version 8.8.1 and 7.17.10 in Github Actions --- .github/workflows/build-and-test.ubuntu-debug.yml | 4 ++-- .github/workflows/build-and-test.ubuntu-release.yml | 4 ++-- .github/workflows/sonar-scan.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-and-test.ubuntu-debug.yml b/.github/workflows/build-and-test.ubuntu-debug.yml index 35a506108..5e44e8ee8 100644 --- a/.github/workflows/build-and-test.ubuntu-debug.yml +++ b/.github/workflows/build-and-test.ubuntu-debug.yml @@ -12,7 +12,7 @@ jobs: runs-on: ${{ matrix.os }} services: elasticsearch8: - image: elastic/elasticsearch:8.6.1 + image: elastic/elasticsearch:8.8.1 options: >- --env ES_JAVA_OPTS="-Xms512m -Xmx512m" --env discovery.type=single-node @@ -22,7 +22,7 @@ jobs: --env cluster.routing.allocation.disk.threshold_enabled=false --publish 9200:9200 elasticsearch7: - image: elastic/elasticsearch:7.17.9 + image: elastic/elasticsearch:7.17.10 options: >- --env ES_JAVA_OPTS="-Xms512m -Xmx512m" --env discovery.type=single-node diff --git a/.github/workflows/build-and-test.ubuntu-release.yml b/.github/workflows/build-and-test.ubuntu-release.yml index d85aed7b6..5fff3893d 100644 --- a/.github/workflows/build-and-test.ubuntu-release.yml +++ b/.github/workflows/build-and-test.ubuntu-release.yml @@ -12,7 +12,7 @@ jobs: runs-on: ${{ matrix.os }} services: elasticsearch8: - image: elastic/elasticsearch:8.6.1 + image: elastic/elasticsearch:8.8.1 options: >- --env ES_JAVA_OPTS="-Xms512m -Xmx512m" --env discovery.type=single-node @@ -22,7 +22,7 @@ jobs: --env cluster.routing.allocation.disk.threshold_enabled=false --publish 9200:9200 elasticsearch7: - image: elastic/elasticsearch:7.17.9 + image: elastic/elasticsearch:7.17.10 options: >- --env ES_JAVA_OPTS="-Xms512m -Xmx512m" --env discovery.type=single-node diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml index bb591b1df..820de552d 100644 --- a/.github/workflows/sonar-scan.yml +++ b/.github/workflows/sonar-scan.yml @@ -12,7 +12,7 @@ jobs: runs-on: ${{ matrix.os }} services: elasticsearch8: - image: elastic/elasticsearch:8.6.1 + image: elastic/elasticsearch:8.8.1 options: >- --env ES_JAVA_OPTS="-Xms512m -Xmx512m" --env discovery.type=single-node From a0e1b28d7b038e2dc11a14825921a3de72e219e0 Mon Sep 17 00:00:00 2001 From: abitmore Date: Wed, 21 Jun 2023 18:00:57 +0000 Subject: [PATCH 2/3] Update CURL version used in CI to 8.1.2 --- .github/workflows/build-and-test.win.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.win.yml b/.github/workflows/build-and-test.win.yml index 2419ff10c..bc17ecff4 100644 --- a/.github/workflows/build-and-test.win.yml +++ b/.github/workflows/build-and-test.win.yml @@ -6,7 +6,7 @@ env: # The following are for windows cross-build only: BOOST_VERSION: 1_69_0 BOOST_DOTTED_VERSION: 1.69.0 - CURL_VERSION: 7.86.0 + CURL_VERSION: 8.1.2 OPENSSL_VERSION: 1.1.1s ZLIB_VERSION: 1.2.13 jobs: From e4ef0a4508f0fc44ef303ddcc1278f36e99c47d5 Mon Sep 17 00:00:00 2001 From: abitmore Date: Wed, 21 Jun 2023 18:01:44 +0000 Subject: [PATCH 3/3] Update OpenSSL version used in CI to 1.1.1u --- .github/workflows/build-and-test.win.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.win.yml b/.github/workflows/build-and-test.win.yml index bc17ecff4..417c8f955 100644 --- a/.github/workflows/build-and-test.win.yml +++ b/.github/workflows/build-and-test.win.yml @@ -7,7 +7,7 @@ env: BOOST_VERSION: 1_69_0 BOOST_DOTTED_VERSION: 1.69.0 CURL_VERSION: 8.1.2 - OPENSSL_VERSION: 1.1.1s + OPENSSL_VERSION: 1.1.1u ZLIB_VERSION: 1.2.13 jobs: prepare-mingw64-libs: