From 70aec40631dc27785b054f728aeee33696456741 Mon Sep 17 00:00:00 2001
From: Omar Abdulla <OmarAbdulla7@hotmail.com>
Date: Mon, 10 Nov 2025 15:27:21 +0300
Subject: [PATCH] Simplify CI

---
 .github/workflows/test.yml | 47 +++++++++++---------------------------
 1 file changed, 13 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2b26b5c..e90ddf1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -81,7 +81,7 @@ jobs:
     needs: cache-polkadot
     strategy:
       matrix:
-        os: [parity-large, parity-macos]
+        os: [ubuntu-24.04, parity-macos]
     env:
       SCCACHE_GHA_ENABLED: "true"
       RUSTC_WRAPPER: "sccache"
@@ -103,19 +103,14 @@ jobs:
       - name: Run Cargo Clippy
         run: cargo make clippy
       - name: Caching Step
-        id: cache-step
         uses: actions/cache@v4
         with:
           path: |
-            ~/.cargo/bin/polkadot
-            ~/.cargo/bin/polkadot-parachain
-            ~/.cargo/bin/polkadot-prepare-worker
-            ~/.cargo/bin/polkadot-execute-worker
             ~/.cargo/bin/eth-rpc
             ~/.cargo/bin/revive-dev-node
           key: polkadot-binaries-${{ env.POLKADOT_SDK_COMMIT_HASH }}-${{ matrix.os }}
       - name: Install Geth on Ubuntu
-        if: matrix.os == 'parity-large'
+        if: matrix.os == 'ubuntu-24.04'
         run: |
           sudo add-apt-repository -y ppa:ethereum/ethereum
           sudo apt-get update
@@ -161,7 +156,7 @@ jobs:
         if: matrix.os == 'parity-macos'
         run: brew install kurtosis-tech/tap/kurtosis-cli
       - name: Install Kurtosis on Ubuntu
-        if: matrix.os == 'parity-large'
+        if: matrix.os == 'ubuntu-24.04'
         run: |
           echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
           sudo apt update
@@ -173,7 +168,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [parity-large, parity-macos]
+        os: [ubuntu-24.04, parity-macos]
     env:
       SCCACHE_GHA_ENABLED: "true"
       RUSTC_WRAPPER: "sccache"
@@ -196,7 +191,7 @@ jobs:
           toolchain: "1.90.0"
 
       - name: Install dependencies (Linux)
-        if: matrix.os == 'parity-large'
+        if: matrix.os == 'ubuntu-24.04'
         run: |
           sudo apt-get update
           sudo apt-get install -y protobuf-compiler clang libclang-dev
@@ -217,10 +212,6 @@ jobs:
         uses: actions/cache@v4
         with:
           path: |
-            ~/.cargo/bin/polkadot
-            ~/.cargo/bin/polkadot-parachain
-            ~/.cargo/bin/polkadot-prepare-worker
-            ~/.cargo/bin/polkadot-execute-worker
             ~/.cargo/bin/eth-rpc
             ~/.cargo/bin/revive-dev-node
           key: polkadot-binaries-${{ env.POLKADOT_SDK_COMMIT_HASH }}-${{ matrix.os }}
@@ -232,19 +223,7 @@ jobs:
             --locked \
             --profile production \
             --package revive-dev-node \
-            --package pallet-revive-eth-rpc \
-            --package polkadot-parachain-bin;
-          cargo build \
-            --locked \
-            --profile testnet \
-            --features fast-runtime \
-            --bin polkadot \
-            --bin polkadot-prepare-worker \
-            --bin polkadot-execute-worker;
-          mv ./target/testnet/polkadot ~/.cargo/bin
-          mv ./target/production/polkadot-parachain ~/.cargo/bin
-          mv ./target/testnet/polkadot-prepare-worker ~/.cargo/bin
-          mv ./target/testnet/polkadot-execute-worker ~/.cargo/bin
+            --package pallet-revive-eth-rpc;
           mv ./target/production/revive-dev-node ~/.cargo/bin
           mv ./target/production/eth-rpc ~/.cargo/bin
           chmod +x ~/.cargo/bin/*
@@ -274,7 +253,7 @@ jobs:
 #     runs-on: ${{ matrix.os }}
 #     strategy:
 #       matrix:
-#         os: [parity-large, parity-macos]
+#         os: [ubuntu-24.04, parity-macos]
 
 #     steps:
 #       - name: Checkout repo and submodules
@@ -283,7 +262,7 @@ jobs:
 #           submodules: recursive
 
 #       - name: Install dependencies (Linux)
-#         if: matrix.os == 'parity-large'
+#         if: matrix.os == 'ubuntu-24.04'
 #         run: |
 #           sudo apt-get update
 #           sudo apt-get install -y protobuf-compiler clang libclang-dev
@@ -340,7 +319,7 @@ jobs:
 #           chmod +x ~/polkadot-cache/*
 
 #       - name: Download Polkadot binaries on Ubuntu
-#         if: matrix.os == 'parity-large' && steps.cache-polkadot.outputs.cache-hit != 'true'
+#         if: matrix.os == 'ubuntu-24.04' && steps.cache-polkadot.outputs.cache-hit != 'true'
 #         run: |
 #           mkdir -p ~/polkadot-cache
 #           curl -sL https://github.com/paritytech/polkadot-sdk/releases/download/${{ env.POLKADOT_VERSION }}/polkadot -o ~/polkadot-cache/polkadot
@@ -355,7 +334,7 @@ jobs:
 #     runs-on: ${{ matrix.os }}
 #     strategy:
 #       matrix:
-#         os: [parity-large, parity-macos]
+#         os: [ubuntu-24.04, parity-macos]
 
 #     steps:
 #       - name: Checkout repo
@@ -400,7 +379,7 @@ jobs:
 #           rustup component add rust-src rustfmt clippy
 
 #       - name: Install Geth on Ubuntu
-#         if: matrix.os == 'parity-large'
+#         if: matrix.os == 'ubuntu-24.04'
 #         run: |
 #           sudo add-apt-repository -y ppa:ethereum/ethereum
 #           sudo apt-get update
@@ -449,7 +428,7 @@ jobs:
 #         run: brew install kurtosis-tech/tap/kurtosis-cli
 
 #       - name: Install Kurtosis on Ubuntu
-#         if: matrix.os == 'parity-large'
+#         if: matrix.os == 'ubuntu-24.04'
 #         run: |
 #           echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
 #           sudo apt update
@@ -500,7 +479,7 @@ jobs:
 #         run: make machete
 
 #       - name: Unit Tests
-#         if: matrix.os == 'parity-large'
+#         if: matrix.os == 'ubuntu-24.04'
 #         run: cargo test --workspace -- --nocapture
 
 #       # We can't install docker in the MacOS image used in CI and therefore we need to skip the