From f198d2c4d2a21984d94e5eacc390ebed827bfe6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=BDiga=20Mrzljak?= <ziga@oasisprotocol.org>
Date: Tue, 21 Jan 2025 15:06:04 +0100
Subject: [PATCH] Add cmake/rust/foundry install to workflows

---
 .github/workflows/ci-playwright.yaml  | 13 +++++++++++++
 .github/workflows/contracts-test.yaml | 13 +++++++++++++
 integrations/foundry/Makefile         |  4 ----
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci-playwright.yaml b/.github/workflows/ci-playwright.yaml
index b5670ca4..576bddbe 100644
--- a/.github/workflows/ci-playwright.yaml
+++ b/.github/workflows/ci-playwright.yaml
@@ -51,6 +51,19 @@ jobs:
         run: pnpm install
       - name: Build JS client
         run: make -C clients/js build
+      - name: Install libclang-dev
+        run: sudo apt-get update && sudo apt-get install -y libclang-dev
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+      - name: Install Rustup
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          profile: minimal
+      - name: Install Rust nightly
+        run: rustup toolchain install nightly
+      - name: Install CMake
+        uses: lukka/get-cmake@latest
       - name: Build Integrations
         run: make -C integrations build
       - uses: JarvusInnovations/background-action@v1
diff --git a/.github/workflows/contracts-test.yaml b/.github/workflows/contracts-test.yaml
index 6cc434f8..b7e35c31 100644
--- a/.github/workflows/contracts-test.yaml
+++ b/.github/workflows/contracts-test.yaml
@@ -53,6 +53,19 @@ jobs:
         run: pnpm install
       - name: Build
         run: make -C clients/js build
+      - name: Install libclang-dev
+        run: sudo apt-get update && sudo apt-get install -y libclang-dev
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+      - name: Install Rustup
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          profile: minimal
+      - name: Install Rust nightly
+        run: rustup toolchain install nightly
+      - name: Install CMake
+        uses: lukka/get-cmake@latest
       - uses: JarvusInnovations/background-action@v1
         name: RPC proxy will error if non-encrypted calls are made
         with:
diff --git a/integrations/foundry/Makefile b/integrations/foundry/Makefile
index 31e2c4e6..139faf49 100644
--- a/integrations/foundry/Makefile
+++ b/integrations/foundry/Makefile
@@ -2,10 +2,6 @@
 all: build test
 
 build:
-	@if ! command -v forge > /dev/null; then \
-		curl -L https://foundry.paradigm.xyz | bash; \
-		$$HOME/.foundry/bin/foundryup; \
-	fi
 	forge install foundry-rs/forge-std --no-commit --no-git
 	forge install oasisprotocol/sapphire-paratime --no-commit --no-git
 	cd src/precompiles && cargo +nightly build --release