refactor: combine test & e2e jobs in ci

jsjoeio · jsjoeio · commit 98da30c9c5aa · 2021-01-28T10:19:57.000-07:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -22,13 +22,30 @@ jobs:
           args: ./ci/steps/lint.sh
 
   test:
+    needs: linux-amd64
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - name: Run ./ci/steps/test.sh
-        uses: ./ci/images/debian10
+      - name: Download release packages
+        uses: actions/download-artifact@v2
         with:
-          args: ./ci/steps/test.sh
+          name: release-packages
+          path: ./release-packages
+      - name: See working directory and files
+        run: |
+          echo "This better print"
+          pwd
+          ls
+      - name: Untar code-server file
+        run: |
+          tar -xzf release-packages/code-server*-linux-amd64.tar.gz
+      - uses: microsoft/playwright-github-action@v1
+      - name: Install dependencies and run tests
+        run: |
+          node code-server*-linux-amd64 &
+          yarn
+          yarn test
+          pkill node
 
   release:
     runs-on: ubuntu-latest
@@ -145,28 +162,3 @@ jobs:
           name: release-images
           path: ./release-images
 
-  e2e:
-    needs: linux-amd64
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - name: Download release packages
-        uses: actions/download-artifact@v2
-        with:
-          name: release-packages
-          path: ./release-packages
-      - name: See working directory and files
-        run: |
-          echo "This better print"
-          pwd
-          ls
-      - name: Untar code-server file
-        run: |
-          tar -xzf release-packages/code-server*-linux-amd64.tar.gz
-      - uses: microsoft/playwright-github-action@v1
-      - name: Install dependencies and run tests
-        run: |
-          node code-server*-linux-amd64 &
-          yarn
-          yarn test
-          pkill node
