From 8774391b0dd2f33b9271b0ce04b78e77c00394df Mon Sep 17 00:00:00 2001
From: Anatoly Laskaris <github_me@nahsi.dev>
Date: Mon, 3 Apr 2023 13:02:04 +0300
Subject: [PATCH 1/5] Add fluence-cli

---
 .github/workflows/e2e.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index a6fd51fe6..c0a829be9 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -42,6 +42,14 @@ jobs:
     with:
       js-client-snapshots: "${{ needs.js-client.outputs.js-client-snapshots }}"
 
+  fluence-cli:
+    needs:
+      - js-client
+
+    uses: fluencelabs/fluence-cli/.github/workflows/tests.yml@FLU-300
+    with:
+      js-client-snapshots: "${{ needs.js-client.outputs.js-client-snapshots }}"
+
   status:
     runs-on: ubuntu-latest
     if: always()

From e369db5754ff3956a065d8979e4d19b7ef2d395f Mon Sep 17 00:00:00 2001
From: Anatoly Laskaris <github_me@nahsi.dev>
Date: Mon, 3 Apr 2023 13:06:11 +0300
Subject: [PATCH 2/5] Update e2e

---
 .github/workflows/e2e.yml       |  9 +++------
 .github/workflows/run-tests.yml | 30 ++++++++++++++++++++++++++++++
 .github/workflows/tests.yml     |  1 +
 3 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 .github/workflows/run-tests.yml

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index c0a829be9..4c405626c 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -23,13 +23,10 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  tests:
-    name: "js-client"
-    uses: ./.github/workflows/tests.yml
-    with:
-      ref: ${{ github.ref }}
-
   js-client:
+    if: >
+      github.event_name == 'push' ||
+      contains(github.event.pull_request.labels.*.name, 'e2e')
     uses: ./.github/workflows/snapshot.yml
     with:
       ref: ${{ github.ref }}
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
new file mode 100644
index 000000000..b35992e6d
--- /dev/null
+++ b/.github/workflows/run-tests.yml
@@ -0,0 +1,30 @@
+name: "test"
+
+on:
+  pull_request:
+    paths-ignore:
+      - "**.md"
+      - ".github/**"
+      - "!.github/workflows/e2e.yml"
+      - "!.github/workflows/tests.yml"
+      - "!.github/workflows/snapshot.yml"
+  push:
+    branches:
+      - "master"
+    paths-ignore:
+      - "**.md"
+      - ".github/**"
+      - "!.github/workflows/e2e.yml"
+      - "!.github/workflows/tests.yml"
+      - "!.github/workflows/snapshot.yml"
+
+concurrency:
+  group: "${{ github.workflow }}-${{ github.ref }}"
+  cancel-in-progress: true
+
+jobs:
+  tests:
+    name: "js-client"
+    uses: ./.github/workflows/tests.yml
+    with:
+      ref: ${{ github.ref }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f0e635d6d..23064dd0c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -39,6 +39,7 @@ jobs:
         node-version:
           - 16.x
           - 17.x
+          - 18.x
 
     steps:
       - name: Import secrets

From bafd3a85c8e01649cc435cefde05a8c74a6fcc41 Mon Sep 17 00:00:00 2001
From: Anatoly Laskaris <github_me@nahsi.dev>
Date: Mon, 3 Apr 2023 13:08:12 +0300
Subject: [PATCH 3/5] Run on labeled

---
 .github/workflows/e2e.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 4c405626c..65b667282 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -8,6 +8,11 @@ on:
       - "!.github/workflows/e2e.yml"
       - "!.github/workflows/tests.yml"
       - "!.github/workflows/snapshot.yml"
+    types:
+      - "labeled"
+      - "synchronize"
+      - "opened"
+      - "reopened"
   push:
     branches:
       - "master"

From ed51c5e07cef871c0707d6cd51da368910d6f96d Mon Sep 17 00:00:00 2001
From: Anatoly Laskaris <github_me@nahsi.dev>
Date: Mon, 3 Apr 2023 13:09:07 +0300
Subject: [PATCH 4/5] Cleanup

---
 .github/workflows/e2e.yml | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 65b667282..535044c9a 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -51,26 +51,3 @@ jobs:
     uses: fluencelabs/fluence-cli/.github/workflows/tests.yml@FLU-300
     with:
       js-client-snapshots: "${{ needs.js-client.outputs.js-client-snapshots }}"
-
-  status:
-    runs-on: ubuntu-latest
-    if: always()
-    needs:
-      - aqua-playground
-
-    steps:
-      - uses: lwhiteley/dependent-jobs-result-check@v1
-        id: status
-        with:
-          statuses: failure,cancelled,skipped
-          dependencies: ${{ toJSON(needs) }}
-
-      - name: Log output
-        run: |
-          echo "statuses:" "${{ steps.status.outputs.statuses }}"
-          echo "jobs:" "${{ steps.status.outputs.jobs }}"
-          echo "found any?:" "${{ steps.status.outputs.found }}"
-
-      - name: Fail run
-        if: fromJSON(steps.status.outputs.found)
-        run: exit 1

From 34092934b887483cf8325f88d53080dc862463cf Mon Sep 17 00:00:00 2001
From: Anatoly Laskaris <github_me@nahsi.dev>
Date: Mon, 3 Apr 2023 14:53:05 +0300
Subject: [PATCH 5/5] Use main branch

---
 .github/workflows/e2e.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 535044c9a..71bea3cad 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -48,6 +48,6 @@ jobs:
     needs:
       - js-client
 
-    uses: fluencelabs/fluence-cli/.github/workflows/tests.yml@FLU-300
+    uses: fluencelabs/fluence-cli/.github/workflows/tests.yml@main
     with:
       js-client-snapshots: "${{ needs.js-client.outputs.js-client-snapshots }}"