ci: finish

aurora-is-near · Oct 12, 2023 · cba61d7 · cba61d7
1 parent 7f1c0e5
commit cba61d7
Show file tree

Hide file tree

Showing 3 changed files with 104 additions and 102 deletions.
diff --git a/.github/workflows/contract-analysis.yml b/.github/workflows/contract-analysis.yml
@@ -1,17 +1,17 @@
-#---
-#on:
-#  push:
-#    branches:
-#      - main
-#      - develop
-#  pull_request:
-#  schedule:
-#    - cron: "30 5 * * *"
-#  workflow_dispatch:
-#
-#name: "Contract Security Analysis"
-#jobs:
-#  contract_analysis:
-#    name: "Shared"
-#    uses: aurora-is-near/.github/.github/workflows/contract_analysis.yml@master
-#    secrets: inherit
+---
+on:
+  push:
+    branches:
+      - main
+      - develop
+  pull_request:
+  schedule:
+    - cron: "30 5 * * *"
+  workflow_dispatch:
+
+name: "Contract Security Analysis"
+jobs:
+  contract_analysis:
+    name: "Shared"
+    uses: aurora-is-near/.github/.github/workflows/contract_analysis.yml@master
+    secrets: inherit
diff --git a/.github/workflows/lints.yml b/.github/workflows/lints.yml
@@ -1,57 +1,57 @@
-#---
-#on:
-#  push:
-#    branches:
-#      - master
-#      - develop
-#  pull_request:
-#
-#name: Lints
-#jobs:
-#  fmt:
-#    name: Format
-#    runs-on: [self-hosted, light]
-#    steps:
-#      - name: Potential broken submodules fix
-#        run: |
-#          git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :
-#      - name: Clone the repository
-#        uses: actions/checkout@v3
-#      - name: Run cargo fmt
-#        run: cargo make check-fmt
-#  clippy:
-#    name: Clippy
-#    runs-on: [self-hosted, heavy]
-#    steps:
-#      - name: Potential broken submodules fix
-#        run: |
-#          git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :
-#      - name: Clone the repository
-#        uses: actions/checkout@v3
-#      - run: cargo make build-contracts
-#      - name: Run Contract cargo clippy
-#        run: cargo make clippy
-#  udeps:
-#    name: Udeps
-#    runs-on: [self-hosted, heavy]
-#    steps:
-#      - name: Potential broken submodules fix
-#        run: |
-#          git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :
-#      - name: Clone the repository
-#        uses: actions/checkout@v3
-#      - name: Run udeps
-#        run: cargo make udeps
-#  contracts:
-#    name: Contracts
-#    runs-on: [self-hosted, light]
-#    steps:
-#      - name: Potential broken submodules fix
-#        run: |
-#          git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :
-#      - name: Clone the repository
-#        uses: actions/checkout@v3
-#      - name: Run yarn lint
-#        run: cargo make check-contracts
-#      - name: Check committed EvmErc20.bin
-#        run: bash scripts/verify_evm_erc20.sh
+---
+on:
+  push:
+    branches:
+      - master
+      - develop
+  pull_request:
+
+name: Lints
+jobs:
+  fmt:
+    name: Format
+    runs-on: [self-hosted, light]
+    steps:
+      - name: Potential broken submodules fix
+        run: |
+          git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :
+      - name: Clone the repository
+        uses: actions/checkout@v3
+      - name: Run cargo fmt
+        run: cargo make check-fmt
+  clippy:
+    name: Clippy
+    runs-on: [self-hosted, heavy]
+    steps:
+      - name: Potential broken submodules fix
+        run: |
+          git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :
+      - name: Clone the repository
+        uses: actions/checkout@v3
+      - run: cargo make build-contracts
+      - name: Run Contract cargo clippy
+        run: cargo make clippy
+  udeps:
+    name: Udeps
+    runs-on: [self-hosted, heavy]
+    steps:
+      - name: Potential broken submodules fix
+        run: |
+          git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :
+      - name: Clone the repository
+        uses: actions/checkout@v3
+      - name: Run udeps
+        run: cargo make udeps
+  contracts:
+    name: Contracts
+    runs-on: [self-hosted, light]
+    steps:
+      - name: Potential broken submodules fix
+        run: |
+          git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :
+      - name: Clone the repository
+        uses: actions/checkout@v3
+      - name: Run yarn lint
+        run: cargo make check-contracts
+      - name: Check committed EvmErc20.bin
+        run: bash scripts/verify_evm_erc20.sh
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: github-hosted-heavy-runner
     strategy:
       matrix:
-        profile: [ mainnet ] #, testnet, mainnet-silo, testnet-silo ]
+        profile: [ mainnet, testnet, mainnet-silo, testnet-silo ]
     steps:
       - name: Potential broken submodules fix
         run: |
@@ -35,7 +35,9 @@ jobs:
         with:
           node-version: 16
           cache: 'yarn'
-          cache-dependency-path: 'etc/eth-contracts'
+          cache-dependency-path: |
+            etc/eth-contracts
+            etc/tests/uniswap
       - name: Install dependencies
         run: cargo make -V || cargo install cargo-make
       - name: Build main contract
@@ -53,32 +55,32 @@ jobs:
       - name: Tests ${{ matrix.profile }}
         run: cargo make --profile ${{ matrix.profile }} test-flow
 
-#  test_modexp:
-#    name: Test modexp suite ${{ matrix.profile }}
-#    runs-on: github-hosted-heavy-runner
-#    strategy:
-#      matrix:
-#        profile: [ mainnet, testnet ]
-#    steps:
-#      - name: Potential broken submodules fix
-#        run: |
-#          git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :
-#      - name: Clone the repository
-#        uses: actions/checkout@v4
-#      - name: Cargo Cache
-#        uses: actions/cache@v3
-#        with:
-#          path: |
-#            ~/.cargo/bin/
-#            ~/.cargo/registry/index/
-#            ~/.cargo/registry/cache/
-#            ~/.cargo/git/db/
-#            target/
-#          key: ${{ matrix.profile }}-cargo-modexp-test
-#      - name: Install dependencies
-#        run: cargo make -V || cargo install cargo-make
-#      - name: Test ${{ matrix.profile }} bench-modexp
-#        run: cargo make --profile ${{ matrix.profile }} bench-modexp
+  test_modexp:
+    name: Test modexp suite ${{ matrix.profile }}
+    runs-on: github-hosted-heavy-runner
+    strategy:
+      matrix:
+        profile: [ mainnet, testnet ]
+    steps:
+      - name: Potential broken submodules fix
+        run: |
+          git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :
+      - name: Clone the repository
+        uses: actions/checkout@v4
+      - name: Cargo Cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ matrix.profile }}-cargo-modexp-test
+      - name: Install dependencies
+        run: cargo make -V || cargo install cargo-make
+      - name: Test ${{ matrix.profile }} bench-modexp
+        run: cargo make --profile ${{ matrix.profile }} bench-modexp
 
 env:
   CARGO_TERM_COLOR: always