From: Dmitry Misharov <dmitry@openssl.org>
Date: Thu, 8 Jan 2026 09:02:50 +0000 (+0100)
Subject: do not hardcode CI workspace path
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca58a66e316340fab63724a98779f44fcb38ac8b;p=thirdparty%2Fopenssl.git

do not hardcode CI workspace path

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/29577)
---

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f8c778a1815..48ab4d4f15f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -792,7 +792,7 @@ jobs:
         persist-credentials: false
     - name: checkout fuzz/corpora and pkcs11-provider submodule
       run: |
-        git config --global --add safe.directory /__w/openssl/openssl
+        git config --global --add safe.directory "$GITHUB_WORKSPACE"
         git submodule update --init --depth 1 fuzz/corpora
         git submodule update --init --depth 1 pkcs11-provider
     - name: config
diff --git a/.github/workflows/interop-tests.yml b/.github/workflows/interop-tests.yml
index abdc5e43d89..0d65d2abb71 100644
--- a/.github/workflows/interop-tests.yml
+++ b/.github/workflows/interop-tests.yml
@@ -50,7 +50,7 @@ jobs:
           sed -i "/^%{_bindir}\/c_rehash$/ d" openssl.spec
           yum-builddep -y /build/SPECS/openssl.spec # just for sure nothing is missing
           mkdir -p /build/SOURCES
-          tar --transform "s/^__w\/openssl\/openssl/openssl-$MAJOR.$MINOR.$PATCH/" -czf /build/SOURCES/openssl-$MAJOR.$MINOR.$PATCH.tar.gz /__w/openssl/openssl/
+          tar --transform "s/^__w\/openssl\/openssl/openssl-$MAJOR.$MINOR.$PATCH/" -czf /build/SOURCES/openssl-$MAJOR.$MINOR.$PATCH.tar.gz "$GITHUB_WORKSPACE"
           rpmbuild -bb /build/SPECS/openssl.spec
           rpm -i --force /build/RPMS/x86_64/openssl-*
           cp ${GITHUB_WORKSPACE}/interop/openssl/openssl.cnf /etc/pki/tls/openssl.cnf