From 6f1c83b33646c0fcebb691632286b9d55007351c Mon Sep 17 00:00:00 2001
From: Marie Idleman <marie.idleman@posit.co>
Date: Mon, 9 Dec 2024 11:01:37 -0600
Subject: [PATCH] fix pr push wflow

---
 .github/workflows/e2e-nightly.yml   | 45 ++++++++++++++---------------
 .github/workflows/pr-merge-push.yml |  3 +-
 build/secrets/.secrets.baseline     |  6 ++--
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/e2e-nightly.yml b/.github/workflows/e2e-nightly.yml
index d9417615405..871945c5ed6 100644
--- a/.github/workflows/e2e-nightly.yml
+++ b/.github/workflows/e2e-nightly.yml
@@ -34,16 +34,16 @@ on:
               - always
 
 jobs:
-  # e2e-electron:
-  #   name: test
-  #   if: ${{ inputs.run_e2e_linux == true || inputs.run_e2e_linux == null }}
-  #   uses: ./.github/workflows/e2e-linux.yml
-  #   with:
-  #     grep: "@dummy-test"
-  #     project: "e2e-electron"
-  #     display_name: "e2e-electron"
-  #     currents_tags: "@nightly,@electron/linux"
-  #   secrets: inherit
+  e2e-electron:
+    name: test
+    if: ${{ inputs.run_e2e_linux == true || inputs.run_e2e_linux == null }}
+    uses: ./.github/workflows/e2e-linux.yml
+    with:
+      grep: "@dummy-test"
+      project: "e2e-electron"
+      display_name: "e2e-electron"
+      currents_tags: "@nightly,@electron/linux"
+    secrets: inherit
 
   e2e-windows:
     name: test
@@ -55,25 +55,24 @@ jobs:
       currents_tags: "@nightly,@electron/win"
     secrets: inherit
 
-  # e2e-browser:
-  #   name: test
-  #   if: ${{ inputs.run_e2e_browser == true || inputs.run_e2e_browser == null }}
-  #   uses: ./.github/workflows/e2e-linux.yml
-  #   with:
-  #     grep: "@dummy-test"
-  #     project: "e2e-browser"
-  #     display_name: "e2e-browser"
-  #     currents_tags: "@nightly,@browser/linux"
-  #   secrets: inherit
+  e2e-browser:
+    name: test
+    if: ${{ inputs.run_e2e_browser == true || inputs.run_e2e_browser == null }}
+    uses: ./.github/workflows/e2e-linux.yml
+    with:
+      grep: "@dummy-test"
+      project: "e2e-browser"
+      display_name: "e2e-browser"
+      currents_tags: "@nightly,@browser/linux"
+    secrets: inherit
 
   slack-notify:
-    # needs: [e2e-electron, e2e-windows, e2e-browser]
-    needs: [e2e-windows]
+    needs: [e2e-electron, e2e-windows, e2e-browser]
     runs-on: ubuntu-latest
     if: always()
     steps:
       - name: Notify Slack
-        uses: midleman/slack-workflow-status@master\
+        uses: midleman/slack-workflow-status@master
         with:
           repo_token: ${{ secrets.POSITRON_GITHUB_PAT }}
           slack_webhook_url: ${{ secrets.SLACK_MARIE_WEBHOOK_URL }}
diff --git a/.github/workflows/pr-merge-push.yml b/.github/workflows/pr-merge-push.yml
index e6f7f8c948b..9344cf614d5 100644
--- a/.github/workflows/pr-merge-push.yml
+++ b/.github/workflows/pr-merge-push.yml
@@ -19,9 +19,10 @@ jobs:
     name: test
     uses: ./.github/workflows/e2e-linux.yml
     with:
-      grep: "@pr"
+      grep: ${{ github.event_name == 'pull_request' && '@pr' || github.event_name == 'push' && '' }}
       project: "e2e-electron"
       display_name: "e2e-electron"
+      currents_tags: ${{ github.event_name == 'pull_request' && '@pr' || github.event_name == 'push' && '@push' }}
     secrets: inherit
 
   unit-tests:
diff --git a/build/secrets/.secrets.baseline b/build/secrets/.secrets.baseline
index 1c5d6448460..9332d53fc71 100644
--- a/build/secrets/.secrets.baseline
+++ b/build/secrets/.secrets.baseline
@@ -139,7 +139,7 @@
         "filename": ".github/workflows/e2e-nightly.yml",
         "hashed_secret": "3e26d6750975d678acb8fa35a0f69237881576b0",
         "is_verified": false,
-        "line_number": 56
+        "line_number": 46
       }
     ],
     ".github/workflows/pr-merge-push.yml": [
@@ -148,7 +148,7 @@
         "filename": ".github/workflows/pr-merge-push.yml",
         "hashed_secret": "3e26d6750975d678acb8fa35a0f69237881576b0",
         "is_verified": false,
-        "line_number": 25
+        "line_number": 26
       }
     ],
     "build/azure-pipelines/alpine/product-build-alpine.yml": [
@@ -1924,5 +1924,5 @@
       }
     ]
   },
-  "generated_at": "2024-12-09T16:32:29Z"
+  "generated_at": "2024-12-09T17:01:40Z"
 }