From e5fc0437b01b1d1f5709c3095eaae780ee3eb34b Mon Sep 17 00:00:00 2001
From: A5 Pickle <a5-pickle@users.noreply.github.com>
Date: Mon, 12 Aug 2024 12:07:47 -0500
Subject: [PATCH] workflows: add e2e

---
 .github/workflows/e2e.yml          | 38 ++++++++++++++++++++++++++++++
 .github/workflows/solana.yml       | 11 +--------
 .github/workflows/universal-rs.yml |  3 ++-
 3 files changed, 41 insertions(+), 11 deletions(-)
 create mode 100644 .github/workflows/e2e.yml

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
new file mode 100644
index 00000000..ad73a419
--- /dev/null
+++ b/.github/workflows/e2e.yml
@@ -0,0 +1,38 @@
+name: e2e
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+env:
+  RUSTC_VERSION: 1.75.0
+jobs:
+  test:
+    name: bash sh/run_test.sh
+    runs-on: ubuntu-latest
+    # Anchor Docker image: https://www.anchor-lang.com/docs/verifiable-builds#images
+    # container: backpackapp/build:v0.30.0
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly
+      - uses: metadaoproject/setup-anchor@v2
+        with:
+          node-version: "20.11.0"
+          solana-cli-version: "1.18.15"
+          anchor-version: "0.30.0"
+      - name: Set default Rust toolchain
+        run: rustup default stable
+      - name: make node_modules
+        run: make node_modules
+      - name: cd evm && make build
+        run: cd evm && make build
+        working-directory: ./evm
+      - name: bash sh/run_test.sh
+        run: bash sh/run_test.sh
+        working-directory: ./e2e
\ No newline at end of file
diff --git a/.github/workflows/solana.yml b/.github/workflows/solana.yml
index c4b884b9..01d6832b 100644
--- a/.github/workflows/solana.yml
+++ b/.github/workflows/solana.yml
@@ -3,20 +3,11 @@ on:
   push:
     branches:
       - main
-      - solana/integration
-  pull_request: null
+  pull_request:
 
 env:
   RUSTC_VERSION: 1.75.0
 jobs:
-  cancel-previous-runs:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.9.1
-        with:
-          access_token: ${{ github.token }}
-
   make-cargo-test-all:
     name: make cargo-test-all
     runs-on: ubuntu-latest
diff --git a/.github/workflows/universal-rs.yml b/.github/workflows/universal-rs.yml
index bae8cc27..45a5567c 100644
--- a/.github/workflows/universal-rs.yml
+++ b/.github/workflows/universal-rs.yml
@@ -2,7 +2,8 @@ name: universal-rs
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
   pull_request:
 
 env: