Merge branch 'nikteliy-fix_build'

gijzelaerr · May 3, 2024 · c2b1c46 · c2b1c46
2 parents 922922f + 8035ef7
commit c2b1c46
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 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=${INPUT_PLATFORM}"
 
 auditwheel repair dist/*.whl --plat ${INPUT_PLATFORM} -w ${INPUT_WHEELDIR}
diff --git a/.github/workflows/build-and-test-amd64.yml b/.github/workflows/build-and-test-amd64.yml
@@ -27,8 +27,8 @@ jobs:
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: wheels
-          path: wheelhouse/*/*.whl
+          name: wheels-${{ runner.os }}
+          path: wheelhouse/${{ runner.os }}/*.whl
 
   windows-build:
     name: Build wheel for windows AMD64
@@ -44,15 +44,15 @@ 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 }}/
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: wheels
-          path: wheelhouse/*/*.whl
+          name: wheels-${{ runner.os }}
+          path: wheelhouse/${{ runner.os }}/*.whl
 
   osx-build:
     name: Build wheel for osx AMD64
@@ -78,16 +78,16 @@ 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 }}/
 
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: wheels
-          path: wheelhouse/*/*.whl
+          name: wheels-${{ runner.os }}
+          path: wheelhouse/${{ runner.os }}/*.whl
 
 
   test-wheels-86_64:
@@ -116,11 +116,11 @@ jobs:
       - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
-          name: wheels
+          name: wheels-${{ runner.os }}
           path: wheelhouse
 
       - name: Install python-snap7
-        run: python3 -m pip install $(ls wheelhouse/${{ runner.os }}/*.whl)
+        run: python3 -m pip install $(ls wheelhouse/*.whl)
 
       - name: Run pytest
         run: |