Update Abseil to LTS 20230125.

Also, upgrade to GCC 7 as required by latest Abseil release.
https://github.com/abseil/abseil-cpp/blob/master/absl/base/policy_checks.h#L57

PiperOrigin-RevId: 509248959

8 files changed, 18 insertions, 10 deletions

diff --git a/kokoro/gcp_ubuntu_per_language/cc/bazel/run_tests.sh b/kokoro/gcp_ubuntu_per_language/cc/bazel/run_tests.sh
index 9e9505530..b2b2668aa 100644
--- a/kokoro/gcp_ubuntu_per_language/cc/bazel/run_tests.sh
+++ b/kokoro/gcp_ubuntu_per_language/cc/bazel/run_tests.sh
@@ -18,6 +18,8 @@
 set -euo pipefail
 cd ${KOKORO_ARTIFACTS_DIR}/git/tink
 
+./kokoro/testutils/upgrade_gcc.sh
+
 cd cc
 use_bazel.sh $(cat .bazelversion)
 bazel build ...
diff --git a/kokoro/gcp_ubuntu_per_language/cc/bazel_absl_status/run_tests.sh b/kokoro/gcp_ubuntu_per_language/cc/bazel_absl_status/run_tests.sh
index c4c49ff87..fa2eb746d 100644
--- a/kokoro/gcp_ubuntu_per_language/cc/bazel_absl_status/run_tests.sh
+++ b/kokoro/gcp_ubuntu_per_language/cc/bazel_absl_status/run_tests.sh
@@ -18,6 +18,8 @@
 set -euo pipefail
 cd ${KOKORO_ARTIFACTS_DIR}/git/tink
 
+./kokoro/testutils/upgrade_gcc.sh
+
 cd cc
 use_bazel.sh $(cat .bazelversion)
 bazel build \
diff --git a/kokoro/gcp_ubuntu_per_language/cc/bazel_fips/run_tests.sh b/kokoro/gcp_ubuntu_per_language/cc/bazel_fips/run_tests.sh
index 57f085a57..905e4215e 100644
--- a/kokoro/gcp_ubuntu_per_language/cc/bazel_fips/run_tests.sh
+++ b/kokoro/gcp_ubuntu_per_language/cc/bazel_fips/run_tests.sh
@@ -18,6 +18,8 @@
 set -euo pipefail
 cd ${KOKORO_ARTIFACTS_DIR}/git/tink
 
+./kokoro/testutils/upgrade_gcc.sh
+
 cd cc
 use_bazel.sh $(cat .bazelversion)
 
diff --git a/kokoro/gcp_ubuntu_per_language/cc/cmake/run_tests.sh b/kokoro/gcp_ubuntu_per_language/cc/cmake/run_tests.sh
index ded59048e..0b6d8e751 100644
--- a/kokoro/gcp_ubuntu_per_language/cc/cmake/run_tests.sh
+++ b/kokoro/gcp_ubuntu_per_language/cc/cmake/run_tests.sh
@@ -20,6 +20,7 @@ if [[ -n "${KOKORO_ROOT:-}" ]]; then
   cd "${KOKORO_ARTIFACTS_DIR}/git/tink"
 fi
 
+./kokoro/testutils/upgrade_gcc.sh
 # Sourcing is needed to update the caller environment.
 # Install CMake 3.10 which is the minimum required.
 source ./kokoro/testutils/install_cmake.sh "3.10.0" \
diff --git a/kokoro/gcp_ubuntu_per_language/cc/cmake_openssl/run_tests.sh b/kokoro/gcp_ubuntu_per_language/cc/cmake_openssl/run_tests.sh
index da19b3a04..d52de1add 100644
--- a/kokoro/gcp_ubuntu_per_language/cc/cmake_openssl/run_tests.sh
+++ b/kokoro/gcp_ubuntu_per_language/cc/cmake_openssl/run_tests.sh
@@ -21,6 +21,7 @@ if [[ -n "${KOKORO_ROOT:-}" ]]; then
 fi
 
 ./kokoro/testutils/update_certs.sh
+./kokoro/testutils/upgrade_gcc.sh
 # Sourcing is needed to update the caller environment.
 source ./kokoro/testutils/install_cmake.sh
 source ./kokoro/testutils/install_openssl.sh
diff --git a/kokoro/gcp_ubuntu_per_language/cc/examples/cmake/run_tests.sh b/kokoro/gcp_ubuntu_per_language/cc/examples/cmake/run_tests.sh
index ce31cc9c0..b1a8dbaca 100644
--- a/kokoro/gcp_ubuntu_per_language/cc/examples/cmake/run_tests.sh
+++ b/kokoro/gcp_ubuntu_per_language/cc/examples/cmake/run_tests.sh
@@ -20,6 +20,7 @@ if [[ -n "${KOKORO_ROOT:-}" ]]; then
   cd "${KOKORO_ARTIFACTS_DIR}/git/tink"
 fi
 
+./kokoro/testutils/upgrade_gcc.sh
 # Sourcing is needed to update the caller environment.
 # Install CMake 3.10 which is the minimum required.
 source ./kokoro/testutils/install_cmake.sh "3.10.0" \
diff --git a/kokoro/gcp_ubuntu_per_language/cc/examples/cmake_openssl/run_tests.sh b/kokoro/gcp_ubuntu_per_language/cc/examples/cmake_openssl/run_tests.sh
index 4b78ebd56..c15c8f125 100644
--- a/kokoro/gcp_ubuntu_per_language/cc/examples/cmake_openssl/run_tests.sh
+++ b/kokoro/gcp_ubuntu_per_language/cc/examples/cmake_openssl/run_tests.sh
@@ -21,6 +21,7 @@ if [[ -n "${KOKORO_ROOT:-}" ]]; then
 fi
 
 ./kokoro/testutils/update_certs.sh
+./kokoro/testutils/upgrade_gcc.sh
 source ./kokoro/testutils/install_cmake.sh
 source ./kokoro/testutils/install_openssl.sh
 
diff --git a/kokoro/testutils/upgrade_gcc.sh b/kokoro/testutils/upgrade_gcc.sh
index 17640a358..edff7ecce 100755
--- a/kokoro/testutils/upgrade_gcc.sh
+++ b/kokoro/testutils/upgrade_gcc.sh
@@ -17,7 +17,7 @@
 
 # This script upgrades GCC when running on Kokoro.
 #
-# Currently this is only needed for Ubuntu 1604 (gcc-5 => gcc-6).
+# Currently this is only needed for Ubuntu 1604 (gcc-5 => gcc-7).
 #
 # Usage instructions:
 #
@@ -25,15 +25,13 @@
 set -e
 
 upgrade_gcc() {
-  if cat /etc/issue | grep "16.04" > /dev/null; then
-    # Install gcc-6.
-    sudo apt install build-essential software-properties-common -y
-    sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
-    sudo apt update
-    sudo apt install gcc-6 g++-6 -y
-    sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 60 \
-      --slave /usr/bin/g++ g++ /usr/bin/g++-6
-  fi
+  # Install gcc-7.
+  sudo apt install build-essential software-properties-common -y
+  sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+  sudo apt update
+  sudo apt install gcc-7 g++-7 -y
+  sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 70 \
+    --slave /usr/bin/g++ g++ /usr/bin/g++-7
   gcc -v
 }