From 6031e41b26fbad3c225b22ad3fc67216485984d1 Mon Sep 17 00:00:00 2001
From: Jake Lishman <jake.lishman@ibm.com>
Date: Tue, 15 Oct 2024 12:55:40 +0100
Subject: [PATCH] New quoting

---
 .github/workflows/wheels-build.yml | 19 +++++++++++--------
 tools/build_pgo.sh                 | 15 +++++++--------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/wheels-build.yml b/.github/workflows/wheels-build.yml
index affa432386da..822a6cacb2d9 100644
--- a/.github/workflows/wheels-build.yml
+++ b/.github/workflows/wheels-build.yml
@@ -112,17 +112,20 @@ jobs:
         #
         # Beware that the heredoc is configured to expand bash variables, but cibuildwheel has
         # special handling for certain variables (`$PATH`, in particular), so you may need to escape
-        # some dollar signs to pass those through to cibuildwheel as variables, not expanded.
-        # Windows paths with backslashes need to be escaped twice - once to get the backslash
-        # through the heredoc, and once to get it through the shell expansion in cibuildwheel.
+        # some dollar signs to pass those through to cibuildwheel as variables, or use single quotes
+        # to prevent shell expansion.
         run: |
+          set -e
+          mkdir -p "$PGO_WORK_DIR"
+
           cat >>"$GITHUB_ENV" <<EOF
-          CIBW_BEFORE_BUILD=bash ./tools/build_pgo.sh /tmp/pgo-data/merged.profdata
-          CIBW_BEFORE_BUILD_WINDOWS=bash ./tools/build_pgo.sh /tmp/pgo-data/merged.profdata && cp /tmp/pgo-data/merged.profdata "\$HOME"
-          CIBW_ENVIRONMENT=RUSTUP_TOOLCHAIN=stable RUSTFLAGS="-Cprofile-use=/tmp/pgo-data/merged.profdata -Cllvm-args=-pgo-warn-missing-function"
-          CIBW_ENVIRONMENT_LINUX=RUSTUP_TOOLCHAIN=stable RUSTFLAGS="-Cprofile-use=/tmp/pgo-data/merged.profdata -Cllvm-args=-pgo-warn-missing-function" PATH="\$PATH:\$HOME/.cargo/bin" CARGO_NET_GIT_FETCH_WITH_CLI="true"
-          CIBW_ENVIRONMENT_WINDOWS=RUSTUP_TOOLCHAIN=stable RUSTFLAGS="-Cprofile-use='\$HOME\\\\merged.profdata' -Cllvm-args=-pgo-warn-missing-function"
+          CIBW_BEFORE_BUILD=bash ./tools/build_pgo.sh $PGO_WORK_DIR $PGO_OUT_PATH
+          CIBW_ENVIRONMENT=RUSTUP_TOOLCHAIN=stable RUSTFLAGS="-Cprofile-use=$PGO_OUT_PATH -Cllvm-args=-pgo-warn-missing-function"
+          CIBW_ENVIRONMENT_LINUX=RUSTUP_TOOLCHAIN=stable RUSTFLAGS="-Cprofile-use=$PGO_OUT_PATH -Cllvm-args=-pgo-warn-missing-function" PATH="\$PATH:\$HOME/.cargo/bin" CARGO_NET_GIT_FETCH_WITH_CLI="true"
           EOF
+        env:
+          PGO_WORK_DIR: ${{ github.workspace }}/pgo-data
+          PGO_OUT_PATH: ${{ github.workspace }}/merged.profdata
       - uses: pypa/cibuildwheel@v2.19.2
       - uses: actions/upload-artifact@v4
         with:
diff --git a/tools/build_pgo.sh b/tools/build_pgo.sh
index 8553691bdfe4..cebf714fff22 100755
--- a/tools/build_pgo.sh
+++ b/tools/build_pgo.sh
@@ -2,16 +2,15 @@
 
 set -x
 
-merged_path=$1
-
-python -c 'import sys;assert sys.platform == "win32"'
-is_win=$?
+work_dir="$1"
+out_path="$2"
 
 set -e
+
 # Create venv for instrumented build and test
 python -m venv build_pgo
 
-if [[ $is_win -eq 0 ]]; then
+if python -c 'import sys; assert sys.platform == "win32"'; then
     source build_pgo/Scripts/activate
 else
     source build_pgo/bin/activate
@@ -25,8 +24,8 @@ fi
 
 # Build with instrumentation
 pip install -U -c constraints.txt setuptools-rust wheel setuptools
-RUSTFLAGS="-Cprofile-generate=/tmp/pgo-data" pip install --prefer-binary -c constraints.txt -r requirements-dev.txt -e .
-RUSTFLAGS="-Cprofile-generate=/tmp/pgo-data" python setup.py build_rust --release --inplace
+RUSTFLAGS="-Cprofile-generate='$work_dir'" pip install --prefer-binary -c constraints.txt -r requirements-dev.txt -e .
+RUSTFLAGS="-Cprofile-generate='$work_dir'" python setup.py build_rust --release --inplace
 # Run profile data generation
 
 QISKIT_PARALLEL=FALSE stestr run --abbreviate
@@ -35,4 +34,4 @@ python tools/pgo_scripts/test_utility_scale.py
 
 deactivate
 
-${HOME}/.rustup/toolchains/*$arch*/lib/rustlib/$arch*/bin/llvm-profdata merge -o $merged_path /tmp/pgo-data
+${HOME}/.rustup/toolchains/*$arch*/lib/rustlib/$arch*/bin/llvm-profdata merge -o "$out_path" "$work_dir"