fix build

gijzelaerr · May 2, 2024 · 0edac94 · 0edac94
1 parent efc1eaa
commit 0edac94
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.github/build_scripts/build_package.sh b/.github/build_scripts/build_package.sh
@@ -7,6 +7,6 @@ popd
 mkdir -p snap7/lib/
 cp /usr/lib/libsnap7.so snap7/lib/
 ${INPUT_PYTHON} -m pip install --upgrade pip wheel build auditwheel patchelf setuptools
-${INPUT_PYTHON} -m build . --wheel -C="--plat-name=${INPUT_PLATFORM}"
+${INPUT_PYTHON} -m build . --wheel -C="--build-option=--plat-name=linux_x86_64"
 
 auditwheel repair dist/*.whl --plat ${INPUT_PLATFORM} -w ${INPUT_WHEELDIR}
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -23,12 +23,15 @@ jobs:
           makefile: x86_64_linux.mk
           python: /opt/python/cp38-cp38/bin/python
           wheeldir: wheelhouse/${{ runner.os }}/
+      - name: --
+        run: ls wheelhouse/Linux
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
           name: wheels
           path: wheelhouse/*/*.whl
+          overwrite: true
 
   windows-build:
     name: Build wheel for windows
@@ -44,15 +47,17 @@ jobs:
         run: |
           mkdir -p snap7/lib/
           Copy-Item .\snap7-full-1.4.2\release\Windows\Win64\snap7.dll .\snap7\lib
-          python3 -m build . --wheel -C="--plat-name=win_amd64"
+          python3 -m build . --wheel -C="--build-option=--plat-name=win_amd64"
           mkdir -p wheelhouse/${{ runner.os }}/
           cp dist/*.whl wheelhouse/${{ runner.os }}/
+          ls wheelhouse/Windows
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
           name: wheels
           path: wheelhouse/*/*.whl
+          overwrite: true
 
   osx-build:
     name: Build wheel for osx
@@ -78,7 +83,7 @@ jobs:
 
       - name: Build wheel
         run: |
-          python3 -m build . --wheel -C="--plat-name=macosx_10_9_universal2"
+          python3 -m build . --wheel -C="--build-option=--plat-name=macosx_10_9_universal2"
           mkdir -p wheelhouse/${{ runner.os }}/
           cp dist/*.whl wheelhouse/${{ runner.os }}/
 
@@ -88,6 +93,7 @@ jobs:
         with:
           name: wheels
           path: wheelhouse/*/*.whl
+          overwrite: true
 
 
   test-wheels-86_64: