Merge pull request #21 from openziti/publish-win32-wheel

Publish win32 wheel

Author: ekoby

.github/workflows/wheels.yml

@@ -10,7 +10,8 @@ jobs:
       matrix:
         spec:
           - { name: 'linux x86_64', runner: ubuntu-20.04, target: manylinux_2_27_x86_64 }
-          - { name: 'macOS x86_64', runner: macos-10.15, target: macosx_10_14_x86_64 }
+          - { name: 'macOS x86_64', runner: macos-11, target: macosx_10_14_x86_64 }
+          - { name: 'Windows x86_64', runner: windows-2019, target: win_amd64 }
     name: building ${{ matrix.spec.name }}
     runs-on: ${{ matrix.spec.runner }}
     env:
@@ -31,16 +32,17 @@ jobs:
 
       - name: Get Ziti SDK C
         run: |
-          set -x
           python tools/get_zitilib.py
 
       - name: Run Integration Tests
         if: ${{ env.HAVE_TEST_ID == 'true' }}
         env:
           ZITI_TEST_IDENTITY: ${{ secrets.ZITI_TEST_IDENTITY }}
           ZITI_IDENTITIES: id.json
+        shell: bash
         run: |
           echo "${ZITI_TEST_IDENTITY}" > "${ZITI_IDENTITIES}"
+          ls
           pip install -r tests/requirements.txt
           pip install .
           python -m unittest tests/ziti_tests.py
@@ -76,7 +78,7 @@ jobs:
           cp download/*/* dist
 
       - name: Publish wheels (TestPYPI)
-        uses: pypa/gh-action-pypi-publish@master
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
           password: ${{ secrets.TEST_PYPI_API_TOKEN }}
@@ -87,7 +89,7 @@ jobs:
 
       - name: Publish wheels (PyPI)
         if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
-        uses: pypa/gh-action-pypi-publish@master
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}

setup.cfg

@@ -38,4 +38,4 @@ tag_prefix = v
 parentdir_prefix = openziti-
 
 [openziti]
-ziti_sdk_version = 0.28.7
+ziti_sdk_version = 0.29.3

src/openziti/zitilib.py

@@ -82,9 +82,14 @@ def __repr__(self):
 ]
 _ziti_enroll.restype = ctypes.c_int
 
-_free = ziti.free
-_free.argtypes = [ctypes.c_void_p]
+def free_win32(arg):
+    pass
 
+if osname != 'windows':
+    _free = ziti.free
+    _free.argtypes = [ctypes.c_void_p]
+else:
+    _free = free_win32
 
 def version():
     ver = _ziti_version().contents

tools/get_zitilib.py

@@ -65,7 +65,7 @@ def get_sdk_version():
         LIBNAME = 'libziti.so'
     elif osname == 'Darwin':
         LIBNAME = 'libziti.dylib'
-    elif osname == 'win64':
+    elif osname == 'Windows':
         LIBNAME = 'ziti.dll'
     else:
         raise RuntimeError("Unsupported platform/arch")