[wip]fix: rectify errors with test ci job

- use latest version of maturin - remove unused logic - use latest github 'upload/download artifacts' jobs - add openssl rust dependency to fix linux build failures
dhruv-ahuja · Oct 14, 2023 · a143db2 · a143db2
1 parent 2ea6c67
commit a143db2
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 85 deletions.
diff --git a/.github/workflows/test_pypi.yml b/.github/workflows/test_pypi.yml
@@ -45,24 +45,12 @@ jobs:
         with:
           target: x86_64
           args: --release --out dist --sdist
-          maturin-version: "v0.14.7"
-      # - name: Install built wheel - x86_64
-      #   run: |
-      #     pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
-      #     pip install pytest
-      #     pytest -v
       - name: Build wheels - universal2
         uses: messense/maturin-action@v1
         with:
           args: --release --universal2 --out dist
-          maturin-version: "v0.14.7"
-      # - name: Install built wheel - universal2
-      #   run: |
-      #     pip install dist/${{ env.PACKAGE_NAME }}-*universal2.whl --force-reinstall
-      #     pip install pytest
-      #     pytest -v
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -89,15 +77,8 @@ jobs:
         with:
           target: ${{ matrix.target }}
           args: --release --out dist
-          maturin-version: "v0.14.7"
-      # - name: Install built wheel
-      #   shell: bash
-      #   run: |
-      #     python -m pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
-      #     pip install pytest
-      #     python -m pytest -v
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -119,15 +100,8 @@ jobs:
           target: ${{ matrix.target }}
           manylinux: auto
           args: --release --out dist
-          maturin-version: "v0.14.7"
-      # - name: Install built wheel
-      #   if: matrix.target == 'x86_64'
-      #   run: |
-      #     pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
-      #     pip install pytest
-      #     pytest -v
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -148,24 +122,8 @@ jobs:
           target: ${{ matrix.target }}
           manylinux: auto
           args: --release --out dist
-          maturin-version: "v0.14.7"
-      # - uses: uraimo/run-on-arch-action@v2.0.5
-      #   if: matrix.target != 'ppc64'
-      #   name: Install built wheel
-      #   with:
-      #     arch: ${{ matrix.target }}
-      #     distro: ubuntu20.04
-      #     githubToken: ${{ github.token }}
-      #     install: |
-      #       apt-get update
-      #       apt-get install -y --no-install-recommends python3 python3-pip
-      #       pip3 install -U pip
-      #     run: |
-      #       pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
-      #       pip install pytest
-      #       pytest -v
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -189,20 +147,8 @@ jobs:
           target: ${{ matrix.target }}
           manylinux: musllinux_1_2
           args: --release --out dist
-          maturin-version: "v0.14.7"
-      # - name: Install built wheel
-      #   if: matrix.target == 'x86_64-unknown-linux-musl'
-      #   uses: addnab/docker-run-action@v3
-      #   with:
-      #     image: alpine:latest
-      #     options: -v ${{ github.workspace }}:/io -w /io
-      #     run: |
-      #       apk add py3-pip
-      #       pip3 install -U pip pytest
-      #       pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links /io/dist/ --force-reinstall
-      #       python3 -m pytest
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -227,21 +173,8 @@ jobs:
           target: ${{ matrix.platform.target }}
           manylinux: musllinux_1_2
           args: --release --out dist
-          maturin-version: "v0.14.7"
-      # - uses: uraimo/run-on-arch-action@master
-      #   name: Install built wheel
-      #   with:
-      #     arch: ${{ matrix.platform.arch }}
-      #     distro: alpine_latest
-      #     githubToken: ${{ github.token }}
-      #     install: |
-      #       apk add py3-pip
-      #       pip3 install -U pip pytest
-      #     run: |
-      #       pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
-      #       python3 -m pytest
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -269,18 +202,11 @@ jobs:
       - name: Build wheels
         uses: messense/maturin-action@v1
         with:
-          maturin-version: "v0.14.7"
           target: ${{ matrix.target }}
           manylinux: auto
           args: --release --out dist -i pypy${{ matrix.python-version }}
-      # - name: Install built wheel
-      #   if: matrix.target == 'x86_64'
-      #   run: |
-      #     pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
-      #     pip install pytest
-      #     pytest -v
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -295,13 +221,12 @@ jobs:
       - linux-cross
       - musllinux
       - musllinux-cross
-      - pypy
     if: ${{ startsWith(github.ref, 'refs/tags/') }}
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: wheels
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v3
       - name: Publish to PyPi
         env:
           TWINE_USERNAME: __token__

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,4 +23,5 @@ regex = "1.9"
 lazy_static = "1.4.0"
 pyo3-log = "*"
 log = "0.4.20"
-colored = "2"
+colored = "2"
+openssl = { version = "0.10", features = ["vendored"] }