From 7c61dd2ba2469e94b98eb23a76cff2be12b670b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karol=20S=C3=B3jko?= <karolsojko@gmail.com>
Date: Mon, 2 Oct 2023 16:18:12 +0200
Subject: [PATCH] Revert "chore: fix workflow syntax"

This reverts commit eb170843e794220c42c213d38ddbd10f1a6bf415.
---
 .github/workflows/publish.yml | 34 ++++++++++++++++++++--------------
 .github/workflows/snjs.pr.yml | 30 ++++++++++++++++++------------
 2 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 35ef3f6ee..f27b8edcf 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -68,24 +68,30 @@ jobs:
   e2e-base:
     name: E2E Base Test Suite
     needs: build-docker
-    if: "${{ contains(github.event.head_commit.message, 'skip e2e') == false }}"
-    uses: standardnotes/server/.github/workflows/e2e-test-suite.yml@main
-    with:
-      snjs_image_tag: ${{ github.sha }}
-      suite: base
-      author: ${{ github.actor }}
-      ref_name: "app:${{ github.ref }}"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run E2E base test suite
+        if: "${{ contains(github.event.head_commit.message, 'skip e2e') == false }}"
+        uses: standardnotes/server/.github/workflows/e2e-test-suite.yml@main
+        with:
+          snjs_image_tag: ${{ github.sha }}
+          suite: base
+          author: ${{ github.actor }}
+          ref_name: "app:${{ github.ref }}"
 
   e2e-vaults:
     name: E2E Vaults Test Suite
     needs: build-docker
-    if: "${{ contains(github.event.head_commit.message, 'skip e2e') == false }}"
-    uses: standardnotes/server/.github/workflows/e2e-test-suite.yml@main
-    with:
-      snjs_image_tag: ${{ github.sha }}
-      suite: vaults
-      author: ${{ github.actor }}
-      ref_name: "app:${{ github.ref }}"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run E2E vaults test suite
+        if: "${{ contains(github.event.head_commit.message, 'skip e2e') == false }}"
+        uses: standardnotes/server/.github/workflows/e2e-test-suite.yml@main
+        with:
+          snjs_image_tag: ${{ github.sha }}
+          suite: vaults
+          author: ${{ github.actor }}
+          ref_name: "app:${{ github.ref }}"
 
   publish:
     name: Publish to NPM
diff --git a/.github/workflows/snjs.pr.yml b/.github/workflows/snjs.pr.yml
index e9b630b54..79ac20e3b 100644
--- a/.github/workflows/snjs.pr.yml
+++ b/.github/workflows/snjs.pr.yml
@@ -76,19 +76,25 @@ jobs:
   e2e-base:
     name: E2E Base Test Suite
     needs: build-docker
-    uses: standardnotes/server/.github/workflows/e2e-test-suite.yml@main
-    with:
-      snjs_image_tag: ${{ github.sha }}
-      suite: base
-      author: ${{ github.actor }}
-      ref_name: "app:${{ github.ref }}"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run E2E test suite
+        uses: standardnotes/server/.github/workflows/e2e-test-suite.yml@main
+        with:
+          snjs_image_tag: ${{ github.sha }}
+          suite: base
+          author: ${{ github.actor }}
+          ref_name: "app:${{ github.ref }}"
 
   e2e-vaults:
     name: E2E Vaults Test Suite
     needs: build-docker
-    uses: standardnotes/server/.github/workflows/e2e-test-suite.yml@main
-    with:
-      snjs_image_tag: ${{ github.sha }}
-      suite: vaults
-      author: ${{ github.actor }}
-      ref_name: "app:${{ github.ref }}"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run E2E vaults test suite
+        uses: standardnotes/server/.github/workflows/e2e-test-suite.yml@main
+        with:
+          snjs_image_tag: ${{ github.sha }}
+          suite: vaults
+          author: ${{ github.actor }}
+          ref_name: "app:${{ github.ref }}"