From 6b440704d894e706bd2cfde192411c287f1461c8 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Wed, 23 Oct 2024 14:50:26 +0200
Subject: [PATCH] GHA: drop "3" from openssl names and keys

Also:
- drop patch suffix from cache key for thread-sanitizer local build
  Follow-up to 73d2779196f5b4d5b45945e06b4bbdec11b6d921 #15379

Closes #15383
---
 .github/workflows/http3-linux.yml | 26 +++++++++++++-------------
 .github/workflows/linux.yml       | 14 +++++++-------
 renovate.json                     |  2 +-
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/http3-linux.yml b/.github/workflows/http3-linux.yml
index 93db357ec964..7025c5640e63 100644
--- a/.github/workflows/http3-linux.yml
+++ b/.github/workflows/http3-linux.yml
@@ -43,7 +43,7 @@ permissions: {}
 env:
   MAKEFLAGS: -j 5
   # handled in renovate.json
-  openssl3-version: 3.4.0
+  openssl-version: 3.4.0
   # handled in renovate.json
   quictls-version: 3.3.0
   # renovate: datasource=github-tags depName=gnutls/gnutls versioning=semver registryUrl=https://github.com
@@ -291,12 +291,12 @@ jobs:
               -DHTTPD_NGHTTPX="$HOME/nghttp2/build/bin/nghttpx"
 
           - name: openssl-quic
-            PKG_CONFIG_PATH: '$HOME/openssl3/build/lib64/pkgconfig'
+            PKG_CONFIG_PATH: '$HOME/openssl/build/lib64/pkgconfig'
             configure: >-
-              LDFLAGS="-Wl,-rpath,$HOME/openssl3/build/lib64"
+              LDFLAGS="-Wl,-rpath,$HOME/openssl/build/lib64"
               --enable-warnings --enable-werror --enable-debug --disable-ntlm
               --with-test-nghttpx="$HOME/nghttp2/build/bin/nghttpx"
-              --with-openssl=$HOME/openssl3/build --with-openssl-quic
+              --with-openssl=$HOME/openssl/build --with-openssl-quic
               --with-nghttp3=$HOME/nghttp3/build
 
           - name: quiche
@@ -395,22 +395,22 @@ jobs:
           key: ${{ runner.os }}-http3-build-${{ env.cache-name }}-${{ env.nghttp2-version }}
           fail-on-cache-miss: true
 
-      - name: cache openssl3
+      - name: cache openssl
         if: matrix.build.name == 'openssl-quic'
         uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4
-        id: cache-openssl3
+        id: cache-openssl
         env:
-          cache-name: cache-openssl3
+          cache-name: cache-openssl
         with:
-          path: /home/runner/openssl3/build
-          key: ${{ runner.os }}-http3-build-${{ env.cache-name }}-${{ env.openssl3-version }}
+          path: /home/runner/openssl/build
+          key: ${{ runner.os }}-http3-build-${{ env.cache-name }}-${{ env.openssl-version }}
 
-      - name: 'install openssl3'
-        if: matrix.build.name == 'openssl-quic' && steps.cache-openssl3.outputs.cache-hit != 'true'
+      - name: 'install openssl'
+        if: matrix.build.name == 'openssl-quic' && steps.cache-openssl.outputs.cache-hit != 'true'
         run: |
-          git clone --quiet --depth=1 -b openssl-${{ env.openssl3-version }} https://github.com/openssl/openssl
+          git clone --quiet --depth=1 -b openssl-${{ env.openssl-version }} https://github.com/openssl/openssl
           cd openssl
-          ./config --prefix=$HOME/openssl3/build
+          ./config --prefix=$HOME/openssl/build
           make -j1 install_sw
           cat exporters/openssl.pc
 
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 9cda56306613..5e93193d9a1f 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -50,7 +50,7 @@ env:
   # renovate: datasource=github-tags depName=awslabs/aws-lc versioning=semver registryUrl=https://github.com
   awslc-version: 1.37.0
   # handled in renovate.json
-  openssl3-version: 3.4.0
+  openssl-version: 3.4.0
   # handled in renovate.json
   quictls-version: 3.3.0
   # renovate: datasource=github-tags depName=rustls/rustls-ffi versioning=semver registryUrl=https://github.com
@@ -233,8 +233,8 @@ jobs:
             configure: >-
               CC=clang
               CFLAGS="-fsanitize=thread -g"
-              LDFLAGS="-fsanitize=thread -Wl,-rpath,$HOME/openssl3/lib"
-              --with-openssl=$HOME/openssl3 --enable-debug
+              LDFLAGS="-fsanitize=thread -Wl,-rpath,$HOME/openssl/lib"
+              --with-openssl=$HOME/openssl --enable-debug
 
           - name: memory-sanitizer
             install_packages: clang
@@ -430,15 +430,15 @@ jobs:
         env:
           cache-name: cache-openssl-tsan
         with:
-          path: /home/runner/openssl3
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ env.openssl3-version }}-d8def798
+          path: /home/runner/openssl
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ env.openssl-version }}
 
       - name: 'build openssl (thread sanitizer)'
         if: contains(matrix.build.install_steps, 'openssl-tsan') && steps.cache-openssl-tsan.outputs.cache-hit != 'true'
         run: |
-          git clone --quiet --depth=1 -b openssl-${{ env.openssl3-version }} https://github.com/openssl/openssl
+          git clone --quiet --depth=1 -b openssl-${{ env.openssl-version }} https://github.com/openssl/openssl
           cd openssl
-          CC="clang" CFLAGS="-fsanitize=thread" LDFLAGS="-fsanitize=thread" ./config --prefix=$HOME/openssl3 --libdir=lib
+          CC="clang" CFLAGS="-fsanitize=thread" LDFLAGS="-fsanitize=thread" ./config --prefix=$HOME/openssl --libdir=lib
           make -j1 install_sw
 
       - name: 'cache quictls'
diff --git a/renovate.json b/renovate.json
index efe632a1d5bb..f8b540785c33 100644
--- a/renovate.json
+++ b/renovate.json
@@ -75,7 +75,7 @@
         "^.github/workflows/http3-linux.yml$"
       ],
       "matchStrings": [
-        "openssl3-version: (?<currentValue>.*)\\s"
+        "openssl-version: (?<currentValue>.*)\\s"
       ],
       "datasourceTemplate": "github-tags",
       "depNameTemplate": "openssl/openssl",