Only fix 20240116

open-telemetry · Jul 11, 2024 · 3b1f185 · 3b1f185
1 parent 2d35432
commit 3b1f185
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/ci/install_abseil.sh b/ci/install_abseil.sh
@@ -49,9 +49,10 @@ fi
 #
 # TODO(marcalff) Cleanup once abseil is upgraded to the next LTS
 
-echo "Patching abseil"
 
-patch -p1 << EOF
+if [ "${ABSEIL_CPP_VERSION}" -eq "20240116.1" ] || [ "${ABSEIL_CPP_VERSION}" -eq "20240116.2" ]; then
+  echo "Patching abseil"
+  patch -p1 << EOF
 commit 779a3565ac6c5b69dd1ab9183e500a27633117d5
 Author: Derek Mauro <dmauro@google.com>
 Date:   Tue Jan 30 10:13:25 2024 -0800
@@ -76,6 +77,9 @@ index 449a2cad..ee9ca9c3 100644
  
  absl_cc_test(
 EOF
+else
+  echo "Not patching abseil"
+fi
 
 mkdir build && pushd build
 cmake "${ABSEIL_CPP_BUILD_OPTIONS[@]}" ..