From d5d60d7ce91ecfbb7947184cf173913640640a81 Mon Sep 17 00:00:00 2001
From: Sean McLaughlin <seanmcl@amazon.com>
Date: Thu, 6 Feb 2025 16:04:48 -0800
Subject: [PATCH] x

---
 .github/workflows/ci.yml | 7 +++++--
 bin/make-wheel           | 2 +-
 interop/pyproject.toml   | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5df3735..235cdd9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,10 +12,10 @@ jobs:
     strategy:
       matrix:
         # We mainly care about hardware rather than OS
-        # macos-13 is x86. This one doesn't work for some reason.
+        # macos-13 is x86
         # macos-latest is arm64
         # ubuntu-latest is x64
-        os: [macos-latest, ubuntu-latest]
+        os: [macos-latest]
 
     runs-on: ${{ matrix.os }}
 
@@ -44,9 +44,12 @@ jobs:
           pytest
       - name: Make a wheel
         # https://github.com/pypa/cibuildwheel
+        env:
+          CIBW_BUILD_VERBOSITY: 1
         run: |
           pip install cibuildwheel
           bin/make-wheel
+
       - uses: actions/upload-artifact@v4
         with:
           name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
diff --git a/bin/make-wheel b/bin/make-wheel
index c394072..c7c7ff3 100755
--- a/bin/make-wheel
+++ b/bin/make-wheel
@@ -23,7 +23,7 @@ if [ -z "${GITHUB_RUN_ID+x}" ]; then
 else
   # https://github.com/pypa/cibuildwheel
   echo "Building wheel via GitHub Actions"
-  python -m cibuildwheel --output-dir $WHEEL_DIR/wheelhouse
+  python -m cibuildwheel --output-dir $ROOT/wheelhouse
 fi
 
 # To upload the wheel, with the proper token in ~/.pypirc, run
diff --git a/interop/pyproject.toml b/interop/pyproject.toml
index 4fc2c54..b939a88 100644
--- a/interop/pyproject.toml
+++ b/interop/pyproject.toml
@@ -30,7 +30,7 @@ testpaths = [
 # NB: All this setuptools stuff took about 1000 hours to figure out so never delete this.
 [tool.setuptools]
 # This makes it ok for there to be both klr and wheelhouse (where we generates wheels on github actions) in the same directory
-packages = ["klr"]
+#packages = ["klr"]
 # This tricks setuptools into knowing this is a binary wheel
 ext-modules = [
   {name = "klr", sources = []}