Double quotes to expand out the bash var, separator

Author: cryos

ci/tools/env-vars

@@ -15,17 +15,19 @@ if [[ ${#} -ne 1 ]]; then
   exit 1
 fi
 
-PYTHON_VERSION_FORMATTED=$(echo '${PY_VER}' | tr -d '.')
+PYTHON_VERSION_FORMATTED=$(echo "${PY_VER}" | tr -d '.')
 if [[ "${HOST_PLATFORM}" == linux* ]]; then
   CIBW_BUILD="cp${PYTHON_VERSION_FORMATTED}-manylinux*"
   REPO_DIR=$(pwd)
+  TOOLS_PATH="${REPO_DIR}/ci/tools"
 elif [[ "${HOST_PLATFORM}" == win* ]]; then
   CIBW_BUILD="cp${PYTHON_VERSION_FORMATTED}-win_amd64"
   PWD=$(pwd)
   REPO_DIR=$(cygpath -w ${PWD})
+  TOOLS_PATH=$(cygpath -w ${PWD}/ci/tools)
 fi
 
-echo "PATH=${REPO_DIR}/ci/tools:${PATH}" >> $GITHUB_ENV
+echo "${TOOLS_PATH}" >> $GITHUB_PATH
 echo "CUDA_BINDINGS_PARALLEL_LEVEL=$(nproc)" >> $GITHUB_ENV
 CUDA_CORE_ARTIFACT_BASENAME="cuda-core-python${PYTHON_VERSION_FORMATTED}-${HOST_PLATFORM}"
 echo "CUDA_CORE_ARTIFACT_BASENAME=${CUDA_CORE_ARTIFACT_BASENAME}" >> $GITHUB_ENV
@@ -37,4 +39,7 @@ echo "CUDA_BINDINGS_ARTIFACT_BASENAME=${CUDA_BINDINGS_ARTIFACT_BASENAME}" >> $GI
 echo "CUDA_BINDINGS_ARTIFACT_NAME=${CUDA_BINDINGS_ARTIFACT_BASENAME}-${SHA}" >> $GITHUB_ENV
 echo "CUDA_BINDINGS_ARTIFACTS_DIR=$(realpath "${REPO_DIR}/cuda_bindings/dist")" >> $GITHUB_ENV
 echo "CUDA_BINDINGS_CYTHON_TESTS_DIR=$(realpath "${REPO_DIR}/cuda_bindings/tests/cython")" >> $GITHUB_ENV
-echo "CIBW_BUILD=${CIBW_BUILD}" >> $GITHUB_ENV
+
+if [[ "${1}" == "build" ]]; then
+  echo "CIBW_BUILD=${CIBW_BUILD}" >> $GITHUB_ENV
+fi