From 30457a492283c9665727a2fb441c72a51d77f4e7 Mon Sep 17 00:00:00 2001
From: David Antoon <david@frontegg.com>
Date: Wed, 6 Sep 2023 10:40:46 +0300
Subject: [PATCH] get version from inputs

---
 .github/workflows/publish-prerelease.yml |  3 ++-
 .github/workflows/trigger-e2e-test.yml   | 14 +++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/publish-prerelease.yml b/.github/workflows/publish-prerelease.yml
index 8daa83b62..9fceef20e 100644
--- a/.github/workflows/publish-prerelease.yml
+++ b/.github/workflows/publish-prerelease.yml
@@ -137,7 +137,8 @@ jobs:
               ref: process.env.PR_REF,
               inputs: {
                 version: process.env.PR_VERSION,
-                dispatch_id: `${repo}/${sha}`,
+                repo,
+                sha
               }
             });
       - name : Notify Slack on alpha version deployment
diff --git a/.github/workflows/trigger-e2e-test.yml b/.github/workflows/trigger-e2e-test.yml
index 001d10002..f69d30e46 100644
--- a/.github/workflows/trigger-e2e-test.yml
+++ b/.github/workflows/trigger-e2e-test.yml
@@ -17,16 +17,18 @@ jobs:
     steps:
       - name: "Trigger E2E tests"
         uses: actions/github-script@v5
+        env:
+          version: ${{ inputs.version }}
+          dispatch_id: ${{ inputs.dispatch_id }}
         with:
           github-token: ${{ secrets.GH_REPOSITORY_ADMIN_TOKEN }}
           script: |
-            const sha = context.payload.after;
-            const repo = context.payload.repository.name
+            const {repo, sha, version} = process.env;
             const owner = context.payload.repository.organization
             const e2eRepo = 'e2e-system-tests'
             const workflow_id = 'frontegg-react-e2e-tests.yml'
             const context = `${owner}/${e2eRepo}`
-            const dispatch_id = `${repo}/${sha}`;
+            const dispatch_id = `${repo}/${sha}`
 
             const res = await github.rest.repos.createCommitStatus({
               context, owner, repo, sha,
@@ -35,10 +37,12 @@ jobs:
             });
 
             const data = await github.rest.actions.createWorkflowDispatch({
-              owner, repo:e2eRepo, workflow_id,
+              owner, 
+              repo:e2eRepo,
+              workflow_id,
               ref: 'main',
               inputs: {
-                version: '1.0.0',
+                version,
                 dispatch_id,
               }
             });