Whisperfork permanent PR

.github/workflows/artifacts.yml

@@ -61,8 +61,8 @@ jobs:
         uses: svenstaro/upload-release-action@v1-release
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ffi/node/libzkgroup.so
-          asset_name: libzkgroup.so
+          file: ffi/node/libzkgroup-x64.so
+          asset_name: libzkgroup-x64.so
           tag: ${{ github.ref }}
           overwrite: true
 
@@ -96,26 +96,20 @@ jobs:
         uses: svenstaro/upload-release-action@v1-release
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ffi/node/libzkgroup.dll
-          asset_name: libzkgroup.dll
+          file: ffi/node/libzkgroup-x64.dll
+          asset_name: libzkgroup-x64.dll
           tag: ${{ github.ref }}
           overwrite: true
 
-  build_macOS_iOS:
-    name: Build macOS + iOS
+  build_macOS:
+    name: Build macOS (Node)
     runs-on: macOS-latest
     steps:
       - uses: actions/checkout@v2
 
       - name: Configure git to use HTTPS
         run: git config --global url."https://${{ secrets.REPO_ACCESS_TOKEN }}:[email protected]".insteadOf ssh://[email protected]
 
-      - name: Install pre-requisites
-        run: |
-          rustup target add aarch64-apple-ios x86_64-apple-ios armv7-apple-ios armv7s-apple-ios
-          cd ffi/swift
-          make install_build_dependencies
-
       - name: Read .nvmrc
         id: node_version
         working-directory: ffi/node
@@ -132,25 +126,12 @@ jobs:
           node --version
           cd ffi/node
           make libzkgroup
-          cd ../../ffi/swift
-          make
-          cd ZKGroup
-          zip -r libzkgroup-ios.zip libzkgroup
 
       - name: Upload macOS
         uses: svenstaro/upload-release-action@v1-release
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ffi/node/libzkgroup.dylib
-          asset_name: libzkgroup.dylib
-          tag: ${{ github.ref }}
-          overwrite: true
-
-      - name: Upload iOS
-        uses: svenstaro/upload-release-action@v1-release
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ffi/swift/ZKGroup/libzkgroup-ios.zip
-          asset_name: libzkgroup-ios.zip
+          file: ffi/node/libzkgroup-x64.dylib
+          asset_name: libzkgroup-x64.dylib
           tag: ${{ github.ref }}
           overwrite: true

.github/workflows/formatting.yml

@@ -11,8 +11,5 @@ jobs:
       - uses: actions/checkout@v2
       - name: Run rustfmt
         run: |
-          rustup toolchain install ${{ env.NIGHTLY_VERSION }}
-          rustup component add rustfmt --toolchain ${{ env.NIGHTLY_VERSION }}
-          cargo +${{ env.NIGHTLY_VERSION }} fmt -- --check
-        env:
-          NIGHTLY_VERSION: nightly-2020-04-12
+          rustup component add rustfmt
+          cargo fmt -- --check

.github/workflows/tests.yml

@@ -30,11 +30,8 @@ jobs:
 
       - name: Run clippy
         run: |
-          rustup toolchain install ${{ env.NIGHTLY_VERSION }}
-          rustup component add clippy --toolchain ${{ env.NIGHTLY_VERSION }}
-          cargo +${{ env.NIGHTLY_VERSION }} clippy -- -D warnings
-        env:
-          NIGHTLY_VERSION: nightly-2020-04-14       
+          rustup component add clippy
+          cargo clippy -- -D warnings
 
       - name: Test Rust
         run: cargo test
@@ -71,32 +68,10 @@ jobs:
     runs-on: macOS-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Configure git to use HTTPS
-        run: git config --global url."https://${{ secrets.REPO_ACCESS_TOKEN }}:[email protected]".insteadOf ssh://[email protected]
 
-      - name: Cache cargo registry
-        uses: actions/cache@v1
-        with:
-          path: ~/.cargo/registry
-          key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
-      - name: Cache cargo index
-        uses: actions/cache@v1
-        with:
-          path: ~/.cargo/git
-          key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
-      - name: Cache cargo build
-        uses: actions/cache@v1
-        with:
-          path: target
-          key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
+      - name: Setup rust toolchain
+        run: rustup show
 
-      - name: Install iOS Rust targets
-        run: rustup target add aarch64-apple-ios x86_64-apple-ios armv7-apple-ios armv7s-apple-ios
-      - name: Build zkgroup library
-        working-directory: ffi/swift
-        run: |
-          make install_build_dependencies
-          make default
-      - name: Test XCode project
-        working-directory: ffi/swift
-        run: xcodebuild test -project ZKGroup.xcodeproj -scheme ZKGroup -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 8'
+      - name: Run pod lint
+        # No import validation because it tries to build unsupported platforms (like 32-bit iOS).
+        run: pod lib lint --verbose --platforms=ios --skip-import-validation --allow-warnings

.gitignore

@@ -1,3 +1,4 @@
+__pycache__
 build
 target
 .idea