Merge pull request #102 from piotr-roslaniec/local-verification-wasm

nucypher · May 4, 2023 · aacdf04 · aacdf04
2 parents 14dabad + 51cd64f
commit aacdf04
Show file tree

Hide file tree

Showing 79 changed files with 1,386 additions and 9,434 deletions.
diff --git a/.github/workflows/maturin.yml b/.github/workflows/maturin.yml
@@ -7,9 +7,8 @@ on:
   pull_request:
   workflow_dispatch:
 
-defaults:
-  run:
-    working-directory: ./ferveo-python
+env:
+  python-versions: [ "3.7", "3.8", "3.9", "3.10" ]
 
 jobs:
   linux:
@@ -22,17 +21,18 @@ jobs:
           #          aarch64,
           #          armv7,
           #          s390x,
-          #          ppc64le
+        #          ppc64le
+        python-version: ${{ env.python-versions }}
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: ${{ matrix.python-version }}
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.target }}
-          args: --release --out dist --find-interpreter
+          args: --release --out dist --find-interpreter --manifest-path ferveo-python/Cargo.toml
           manylinux: auto
       - name: Upload wheels
         uses: actions/upload-artifact@v3
@@ -45,17 +45,18 @@ jobs:
     strategy:
       matrix:
         target: [ x64, x86 ]
+        python-version: ${{ env.python-versions }}
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: ${{ matrix.python-version }}
           architecture: ${{ matrix.target }}
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.target }}
-          args: --release --out dist --find-interpreter
+          args: --release --out dist --find-interpreter --manifest-path ferveo-python/Cargo.toml
       - name: Upload wheels
         uses: actions/upload-artifact@v3
         with:
@@ -67,16 +68,17 @@ jobs:
     strategy:
       matrix:
         target: [ x86_64, aarch64 ]
+        python-version: ${{ env.python-versions }}
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: ${{ matrix.python-version }}
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.target }}
-          args: --release --out dist --find-interpreter
+          args: --release --out dist --find-interpreter --manifest-path ferveo-python/Cargo.toml
       - name: Upload wheels
         uses: actions/upload-artifact@v3
         with:

diff --git a/.github/workflows/workspace.yml b/.github/workflows/workspace.yml
@@ -48,6 +48,11 @@ jobs:
         with:
           crate: cargo-machete
       - run: cargo machete
+      - name: Install cargo-sort
+        uses: baptiste0928/cargo-install@v1
+        with:
+          crate: cargo-sort
+      - run: cargo sort --check
 
   test:
     runs-on: ubuntu-latest
@@ -101,7 +106,7 @@ jobs:
           override: true
       - run: cargo install wasm-pack
       - run: wasm-pack test --node
-        working-directory: tpke-wasm
+        working-directory: ferveo-wasm
 
   yarn-test:
     runs-on: ubuntu-latest
@@ -121,16 +126,16 @@ jobs:
           override: true
       - run: cargo install wasm-pack
       - run: wasm-pack build --target nodejs
-        working-directory: tpke-wasm
+        working-directory: ferveo-wasm
       - uses: borales/actions-yarn@v3.0.0
         with:
-          cmd: --cwd tpke-wasm/examples/node install
+          cmd: --cwd ferveo-wasm/examples/node install
       - uses: borales/actions-yarn@v3.0.0
         with:
-          cmd: --cwd tpke-wasm/examples/node build
+          cmd: --cwd ferveo-wasm/examples/node build
       - uses: borales/actions-yarn@v3.0.0
         with:
-          cmd: --cwd tpke-wasm/examples/node test
+          cmd: --cwd ferveo-wasm/examples/node test
 
   python-test:
     runs-on: ubuntu-latest

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
 target
 *.wasm
-tpke-python/py-benches/inputs/
 .venv