ci: Adjusted workflows

Author: 0xJurassicPunk

.github/workflows/tests.yaml

@@ -7,32 +7,7 @@ on:
       - master
 
 jobs:
-  test-typescript:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 14.x
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v2
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - name: Install dependencies
-        run: yarn install --frozen-lockfile
-      - name: Compile code
-        run: yarn compile:force
-      - name: Run TypeScript/Waffle tests
-        run: yarn test
-  tests-forge:
+  tests:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -59,5 +34,9 @@ jobs:
         uses: onbjerg/foundry-toolchain@v1
         with:
           version: nightly
+      - name: Compile code (Hardhat)
+        run: yarn compile:force
+      - name: Run TypeScript/Waffle tests
+        run: yarn test
       - name: Run Solidity/Forge tests
         run: forge test