From 2efead687fd4d7a1172e5ea7e193406cc51f59c7 Mon Sep 17 00:00:00 2001 From: Harsh Gandhi <63674702+HarshGandhi-AWS@users.noreply.github.com> Date: Fri, 13 Oct 2023 18:17:51 -0700 Subject: [PATCH] Updated google-test lib version to v1.12.0 (#431) --- .../base-images/device-client/amazonlinux/Dockerfile | 6 +++--- .../docker-images/base-images/device-client/ubi8/Dockerfile | 6 +++--- .../base-images/device-client/ubuntu/Dockerfile | 6 +++--- .../build-from-source-package-licenses-ubi8.txt | 2 +- .../build-from-source-package-licenses.txt | 2 +- CMakeLists.txt.gtest | 2 +- integration-tests/CMakeLists.txt.gtest | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/docker-images/base-images/device-client/amazonlinux/Dockerfile b/.github/docker-images/base-images/device-client/amazonlinux/Dockerfile index f2ebc7c54..466f51970 100644 --- a/.github/docker-images/base-images/device-client/amazonlinux/Dockerfile +++ b/.github/docker-images/base-images/device-client/amazonlinux/Dockerfile @@ -46,9 +46,9 @@ RUN curl -sSL https://github.com/Kitware/CMake/releases/download/v3.24.4/cmake-3 # Clone and build Google Test ############################################################################### WORKDIR /tmp -RUN curl -sSL https://github.com/google/googletest/archive/release-1.11.0.tar.gz -o release-1.11.0.tar.gz \ - && tar xf release-1.11.0.tar.gz \ - && cd googletest-release-1.11.0 \ +RUN curl -sSL https://github.com/google/googletest/archive/release-1.12.0.tar.gz -o release-1.12.0.tar.gz \ + && tar xf release-1.12.0.tar.gz \ + && cd googletest-release-1.12.0 \ && cmake -DBUILD_SHARED_LIBS=ON . \ && make \ && cp -a googletest/include/gtest /usr/include/ \ diff --git a/.github/docker-images/base-images/device-client/ubi8/Dockerfile b/.github/docker-images/base-images/device-client/ubi8/Dockerfile index ea238c10f..71c6e377a 100644 --- a/.github/docker-images/base-images/device-client/ubi8/Dockerfile +++ b/.github/docker-images/base-images/device-client/ubi8/Dockerfile @@ -59,9 +59,9 @@ RUN wget https://dist.opendnssec.org/source/softhsm-2.3.0.tar.gz \ # Clone and build Google Test ############################################################################### WORKDIR /tmp -RUN curl -sSL https://github.com/google/googletest/archive/release-1.11.0.tar.gz -o release-1.11.0.tar.gz \ - && tar xf release-1.11.0.tar.gz \ - && cd googletest-release-1.11.0 \ +RUN curl -sSL https://github.com/google/googletest/archive/release-1.12.0.tar.gz -o release-1.12.0.tar.gz \ + && tar xf release-1.12.0.tar.gz \ + && cd googletest-release-1.12.0 \ && cmake -DBUILD_SHARED_LIBS=ON . \ && make \ && cp -a googletest/include/gtest /usr/include/ \ diff --git a/.github/docker-images/base-images/device-client/ubuntu/Dockerfile b/.github/docker-images/base-images/device-client/ubuntu/Dockerfile index abf3df6a5..96710cec6 100644 --- a/.github/docker-images/base-images/device-client/ubuntu/Dockerfile +++ b/.github/docker-images/base-images/device-client/ubuntu/Dockerfile @@ -46,9 +46,9 @@ RUN curl -sSL https://github.com/Kitware/CMake/releases/download/v3.10.0/cmake-3 # Clone and build Google Test ############################################################################### WORKDIR /tmp -RUN wget --ca-certificate=/etc/ssl/certs/ca-certificates.crt https://github.com/google/googletest/archive/release-1.11.0.tar.gz \ - && tar xf release-1.11.0.tar.gz \ - && cd googletest-release-1.11.0 \ +RUN wget --ca-certificate=/etc/ssl/certs/ca-certificates.crt https://github.com/google/googletest/archive/release-1.12.0.tar.gz \ + && tar xf release-1.12.0.tar.gz \ + && cd googletest-release-1.12.0 \ && cmake -DBUILD_SHARED_LIBS=ON . \ && make \ && cp -a googletest/include/gtest /usr/include/ \ diff --git a/.github/docker-images/oss-compliance/build-from-source-packages/build-from-source-package-licenses-ubi8.txt b/.github/docker-images/oss-compliance/build-from-source-packages/build-from-source-package-licenses-ubi8.txt index ed47595f5..0cc64d0b0 100644 --- a/.github/docker-images/oss-compliance/build-from-source-packages/build-from-source-package-licenses-ubi8.txt +++ b/.github/docker-images/oss-compliance/build-from-source-packages/build-from-source-package-licenses-ubi8.txt @@ -377,7 +377,7 @@ Public License instead of this License. ------ -** Google Test 1.10.0; version 1.10.0 -- https://github.com/google/googletest/blob/v1.10.x/LICENSE +** Google Test 1.12.0; version 1.12.0 -- https://github.com/google/googletest/blob/v1.12.x/LICENSE Copyright 2008, Google Inc. All rights reserved. diff --git a/.github/docker-images/oss-compliance/build-from-source-packages/build-from-source-package-licenses.txt b/.github/docker-images/oss-compliance/build-from-source-packages/build-from-source-package-licenses.txt index 750f986c8..d1457f170 100644 --- a/.github/docker-images/oss-compliance/build-from-source-packages/build-from-source-package-licenses.txt +++ b/.github/docker-images/oss-compliance/build-from-source-packages/build-from-source-package-licenses.txt @@ -343,7 +343,7 @@ Public License instead of this License. ------ -** Google Test 1.10.0; version 1.10.0 -- https://github.com/google/googletest/blob/v1.10.x/LICENSE +** Google Test 1.12.0; version 1.12.0 -- https://github.com/google/googletest/blob/v1.12.x/LICENSE Copyright 2008, Google Inc. All rights reserved. diff --git a/CMakeLists.txt.gtest b/CMakeLists.txt.gtest index cae958444..341249e80 100644 --- a/CMakeLists.txt.gtest +++ b/CMakeLists.txt.gtest @@ -5,7 +5,7 @@ project(googletest-download NONE) include(ExternalProject) ExternalProject_Add(googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG release-1.10.0 + GIT_TAG release-1.12.0 SOURCE_DIR "${CMAKE_BINARY_DIR}/googletest-src" BINARY_DIR "${CMAKE_BINARY_DIR}/googletest-build" CONFIGURE_COMMAND "" diff --git a/integration-tests/CMakeLists.txt.gtest b/integration-tests/CMakeLists.txt.gtest index 1e6307831..becd6bd68 100644 --- a/integration-tests/CMakeLists.txt.gtest +++ b/integration-tests/CMakeLists.txt.gtest @@ -5,7 +5,7 @@ project(googletest-download NONE) include(ExternalProject) ExternalProject_Add(googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG release-1.11.0 + GIT_TAG release-1.12.0 SOURCE_DIR "${CMAKE_BINARY_DIR}/googletest-src" BINARY_DIR "${CMAKE_BINARY_DIR}/googletest-build" CMAKE_ARGS -DCMAKE_BUILD_TYPE=Debug