merged upstream into master

everstake · Jan 19, 2022 · 565bbd4 · 565bbd4
2 parents 65f0260 + b6bafc7
commit 565bbd4
Show file tree

Hide file tree

Showing 222 changed files with 27,953 additions and 5,177 deletions.
diff --git a/.github/workflows/pull-request-stake-pool.yml b/.github/workflows/pull-request-stake-pool.yml
@@ -23,7 +23,6 @@ jobs:
           echo "RUST_STABLE=$rust_stable" >> $GITHUB_ENV
           source ci/solana-version.sh
           echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV
-
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: ${{ env.RUST_STABLE }}
@@ -53,7 +52,6 @@ jobs:
           ./ci/install-build-deps.sh
           ./ci/install-program-deps.sh
           echo "$HOME/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH
-
       - name: Build and test
         run: ./ci/cargo-test-bpf.sh stake-pool
 
@@ -64,26 +62,50 @@ jobs:
           path: "target/deploy/*.so"
           if-no-files-found: error
 
-  # py-test:
-  #   runs-on: ubuntu-latest
-  #   needs: cargo-test-bpf
-  #   steps:
-  #     - uses: actions/checkout@v2
+  js-test:
+    runs-on: ubuntu-latest
+    env:
+      NODE_VERSION: 16.x
+    needs: cargo-test-bpf
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ env.NODE_VERSION }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+      - uses: actions/cache@v2
+        with:
+          path: ~/.npm
+          key: node-${{ hashFiles('stake-pool/js/package-lock.json') }}
+          restore-keys: |
+            node-
+      - name: Download programs
+        uses: actions/download-artifact@v2
+        with:
+          name: stake-pool-programs
+          path: target/deploy
+      - run: ./ci/js-test-stake-pool.sh
 
-  #     - name: Setup Python version
-  #       uses: actions/setup-python@v2
-  #       with:
-  #         python-version: 3.8
+  py-test:
+    runs-on: ubuntu-latest
+    needs: cargo-test-bpf
+    steps:
+      - uses: actions/checkout@v2
 
-  #     - uses: actions/cache@v2
-  #       with:
-  #         path: ~/.cache/pip
-  #         key: pip-stake-pool-${{ hashFiles('stake-pool/py/requirements.txt') }}
+      - name: Setup Python version
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
 
-  #     - name: Download programs
-  #       uses: actions/download-artifact@v2
-  #       with:
-  #         name: stake-pool-programs
-  #         path: target/deploy
+      - uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key: pip-stake-pool-${{ hashFiles('stake-pool/py/requirements.txt') }}
+
+      - name: Download programs
+        uses: actions/download-artifact@v2
+        with:
+          name: stake-pool-programs
+          path: target/deploy
 
-  #     - run: ./ci/py-test-stake-pool.sh
+      - run: ./ci/py-test-stake-pool.sh
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -15,6 +15,7 @@ jobs:
     needs:
       - rustfmt
       - clippy
+      - audit
       - cargo-build-test
     steps:
       - run: echo "Done"
@@ -78,6 +79,31 @@ jobs:
           command: clippy
           args: -Zunstable-options --workspace --all-targets -- --deny=warnings
 
+  audit:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set env vars
+        run: |
+          source ci/rust-version.sh
+          echo "RUST_STABLE=$rust_stable" >> $GITHUB_ENV
+
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ env.RUST_STABLE }}
+          override: true
+          profile: minimal
+
+      - name: Install Cargo Audit
+        uses: actions-rs/[email protected]
+        with:
+          crate: cargo-audit
+          version: latest
+
+      - name: Run Cargo Audit
+        run: ./ci/do-audit.sh
+
   cargo-build-test:
     runs-on: ubuntu-latest
     steps: