x

leanprover · Feb 7, 2025 · fc86871 · fc86871
1 parent 916b5fc
commit fc86871
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git 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
@@ -12,6 +12,7 @@ cp -R $ROOT/interop/nki $WHEEL_DIR/klr/nki
 cp -R $ROOT/interop/klr $WHEEL_DIR/klr/klr
 cp $ROOT/LICENSE $WHEEL_DIR
 cp $ROOT/interop/README.md $WHEEL_DIR
+cp $ROOT/interop/noop.c $WHEEL_DIR
 cp $ROOT/interop/pyproject.toml $WHEEL_DIR
 cp $ROOT/interop/MANIFEST.in $WHEEL_DIR
 
@@ -23,7 +24,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/noop.c b/interop/noop.c
@@ -0,0 +1,6 @@
+#include <stdio.h>
+
+int main() {
+    printf("Hello, World!\n");
+    return 0;
+}
diff --git a/interop/pyproject.toml b/interop/pyproject.toml
@@ -30,10 +30,10 @@ 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 = []}
+  {name = "klr.noop", sources = ["noop.c"]}
 ]
 
 [tool.setuptools.package-data]