From a654828628a65568b8cda71844ba9166aba239f7 Mon Sep 17 00:00:00 2001
From: Peter Smith <peter@blueoceancomputing.co.uk>
Date: Wed, 19 Jun 2024 13:26:09 +0100
Subject: [PATCH] ci: moved integration to after the release step only

---
 .github/workflows/test-integration.yaml | 32 +++++++++++++++++
 .github/workflows/test.yaml             | 47 +------------------------
 2 files changed, 33 insertions(+), 46 deletions(-)
 create mode 100644 .github/workflows/test-integration.yaml

diff --git a/.github/workflows/test-integration.yaml b/.github/workflows/test-integration.yaml
new file mode 100644
index 00000000000..ea73a6f5390
--- /dev/null
+++ b/.github/workflows/test-integration.yaml
@@ -0,0 +1,32 @@
+name: "Test Integration"
+
+on:
+  workflow_run:
+    workflow: [Release]
+    types:
+      - completed
+
+jobs:
+  create-fuels-template-integration:
+    timeout-minutes: 10
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Test Setup
+        uses: ./.github/actions/test-setup
+        with:
+          should-install-bun: true
+
+      - name: Run Isolated Tests
+        run: pnpm test:integration
+        env:
+          PUBLISHED_NPM_VERSION: next
+
+      - name: Run UI tests
+        run: sh ./scripts/create-fuels-template-integration.sh
+        env:
+          PUBLISHED_NPM_VERSION: next
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 74572fab077..d198f2459c2 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -47,52 +47,10 @@ jobs:
           path: coverage/environments/${{ matrix.env.name }}
           overwrite: true
 
-  publish:
-    runs-on: ubuntu-latest
-    outputs:
-      published_version: ${{ steps.release.outputs.published_version }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Test Setup
-        uses: ./.github/actions/test-setup
-
-      - name: Publish PR to NPM
-        id: release
-        uses: ./.github/actions/pr-release
-        with:
-          npm-token: ${{ secrets.NPM_TOKEN }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Echo Published Version
-        run: echo ${{ steps.release.outputs.published_version }}
-
-  create-fuels-template-integration:
-    timeout-minutes: 10
-    runs-on: ubuntu-latest
-    needs: [publish]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Test Setup
-        uses: ./.github/actions/test-setup
-
-      - name: Run UI tests
-        run: sh ./scripts/create-fuels-template-integration.sh
-        env:
-          PUBLISHED_NPM_VERSION: ${{ needs.publish.outputs.published_version }}
-
   e2e:
     runs-on: ubuntu-latest
     timeout-minutes: 10
-    needs: [environments, publish]
-    if: ${{ !github.event.pull_request.draft }}
+    needs: [environments]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -101,8 +59,6 @@ jobs:
 
       - name: Test Setup
         uses: ./.github/actions/test-setup
-        with:
-          should-install-bun: true
 
       - name: Pretest
         run: pnpm pretest
@@ -112,7 +68,6 @@ jobs:
         env:
           TESTNET_WALLET_PVT_KEY: ${{ secrets.TESTNET_WALLET_PVT_KEY }}
           DEVNET_WALLET_PVT_KEY: ${{ secrets.DEVNET_WALLET_PVT_KEY }}
-          PUBLISHED_NPM_VERSION: ${{ steps.release.outputs.published_version }}
 
   test:
     if: github.base_ref == 'master' || github.ref_name == 'master'