From 1d5a96cf56a5cc04e94352ad18886e9468272f5a Mon Sep 17 00:00:00 2001
From: madlabman <10616301+madlabman@users.noreply.github.com>
Date: Thu, 29 Feb 2024 12:34:58 +0100
Subject: [PATCH] build: fix workflows

---
 .github/workflows/bootstrap.yml | 35 ----------------------------
 .github/workflows/test.yml      | 41 +++++++++++++++++++++++++++++----
 2 files changed, 37 insertions(+), 39 deletions(-)
 delete mode 100644 .github/workflows/bootstrap.yml

diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
deleted file mode 100644
index 2fc5898b..00000000
--- a/.github/workflows/bootstrap.yml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-name: Install required tooling
-
-on:
-  workflow_call:
-
-jobs:
-  bootstrap:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          persist-credentials: false
-
-      - name: Install node
-        uses: actions/setup-node@v3
-        with:
-          node-version-file: ".nvmrc"
-          cache: yarn
-          cache-dependency-path: "**/yarn.lock"
-
-      - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1
-        with:
-          version: nightly
-
-      - name: Install just
-        run: sudo snap install --edge --classic just
-
-      - name: Versions
-        run: |
-          forge --version
-          just --version
-          yarn --version
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 26f3c80f..1e1f8502 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,8 +18,19 @@ jobs:
     name: Linters
     runs-on: ubuntu-latest
     steps:
-      - name: Bootstrap
-        uses: ./.github/workflows/bootstrap.yml
+      - uses: actions/checkout@v3
+        with:
+          persist-credentials: false
+
+      - name: Install node
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: ".nvmrc"
+          cache: yarn
+          cache-dependency-path: "**/yarn.lock"
+
+      - name: Install just
+        run: conda install -c conda-forge just
 
       - name: Linters check
         run: just lint
@@ -28,8 +39,30 @@ jobs:
     name: Foundry project
     runs-on: ubuntu-latest
     steps:
-      - name: Bootstrap
-        uses: ./.github/workflows/bootstrap.yml
+      - uses: actions/checkout@v3
+        with:
+          persist-credentials: false
+
+      - name: Install node
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: ".nvmrc"
+          cache: yarn
+          cache-dependency-path: "**/yarn.lock"
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly
+
+      - name: Foundry version
+        run: forge --version
+
+      - name: Install just
+        run: conda install -c conda-forge just
+
+      - name: Install dependencies
+        run: just deps
 
       - name: Build
         run: just build --sizes