From ef546c1a78d5bfd0c79804ad824bc8d7601ff860 Mon Sep 17 00:00:00 2001
From: Ryan Mast <mast9@llnl.gov>
Date: Fri, 2 Feb 2024 22:39:46 -0800
Subject: [PATCH] Adjust path for wheels to upload and logic for detecting when
 to use pre-built Linux binaries

---
 .github/workflows/pythonpackage.yml | 7 +++----
 helics_apps-pip/CMakeLists.txt      | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
index 80c443b..e4c445c 100644
--- a/.github/workflows/pythonpackage.yml
+++ b/.github/workflows/pythonpackage.yml
@@ -71,7 +71,7 @@ jobs:
     - uses: actions/upload-artifact@v4
       with:
         name: apps-python-dist-${{matrix.artifact_suffix}}
-        path: helics_apps-pip/wheelhouse/*.whl
+        path: wheelhouse/*.whl
 
   build-helics_apps-sdist:
     runs-on: ubuntu-latest
@@ -81,9 +81,8 @@ jobs:
         fetch-depth: 0  # for setuptools_scm to find tags
 
     - name: Build sdist
-      run: |
-        cd ./helics_apps-pip
-        pipx run build --sdist
+      working-directory: helics_apps-pip
+      run: pipx run build --sdist
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v4
diff --git a/helics_apps-pip/CMakeLists.txt b/helics_apps-pip/CMakeLists.txt
index dca4d23..cd70c48 100644
--- a/helics_apps-pip/CMakeLists.txt
+++ b/helics_apps-pip/CMakeLists.txt
@@ -7,7 +7,7 @@ include(FetchContent)
 
 # Note: Linux requires a hint for whether this wheel should be for manylinux (glibc) or musllinux
 # -- The CIBW_ARTIFACT_TYPE environment variable is only expected to be set during official release builds using cibuildwheel on GHA CI systems
-if(LINUX AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND ENV{CIBW_ARTIFACT_TYPE} STREQUAL "manylinux_x86_64")
+if(LINUX AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND "$ENV{CIBW_ARTIFACT_TYPE}" STREQUAL "manylinux_x86_64")
     set(HELICS_DOWNLOAD_URL https://github.com/GMLC-TDC/HELICS/releases/download/v${SKBUILD_PROJECT_VERSION}/Helics-${SKBUILD_PROJECT_VERSION}-Linux-x86_64.tar.gz)
 elseif(APPLE AND CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     set(HELICS_DOWNLOAD_URL https://github.com/GMLC-TDC/HELICS/releases/download/v${SKBUILD_PROJECT_VERSION}/Helics-${SKBUILD_PROJECT_VERSION}-macOS-universal2.zip)