From 47475bada68e9149fde4a47135dc80cdf880c351 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Mon, 15 Mar 2021 10:42:11 +0000
Subject: [PATCH] Update frontend-collab-tests.yml

---
 .github/workflows/frontend-collab-tests.yml | 62 +--------------------
 1 file changed, 3 insertions(+), 59 deletions(-)

diff --git a/.github/workflows/frontend-collab-tests.yml b/.github/workflows/frontend-collab-tests.yml
index ac801740c..c8d9eddd7 100644
--- a/.github/workflows/frontend-collab-tests.yml
+++ b/.github/workflows/frontend-collab-tests.yml
@@ -1,59 +1,10 @@
 # Leave the powered by Sauce Labs bit in as this means we get additional concurrency
-name: "Frontend tests powered by Sauce Labs"
+name: "Frontend Collaboration tests powered by Sauce Labs"
 
 on: [push]
 
 jobs:
-  withoutplugins:
-    name: without plugins
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Generate Sauce Labs strings
-      id: sauce_strings
-      run: |
-        printf %s\\n '::set-output name=name::${{ github.workflow }} - ${{ github.job }}'
-        printf %s\\n '::set-output name=tunnel_id::${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}'
-
-    - name: Checkout repository
-      uses: actions/checkout@v2
-
-    - uses: actions/setup-node@v2
-      with:
-        node-version: 12
-
-    - name: Install all dependencies and symlink for ep_etherpad-lite
-      run: src/bin/installDeps.sh
-
-    - name: export GIT_HASH to env
-      id: environment
-      run: echo "::set-output name=sha_short::$(git rev-parse --short ${{ github.sha }})"
-
-    - name: Create settings.json
-      run: cp settings.json.template settings.json
-
-    - name: Disable import/export rate limiting
-      run: |
-        sed -e '/^ *"importExportRateLimiting":/,/^ *\}/ s/"max":.*/"max": 0/' -i settings.json
-
-    - uses: saucelabs/sauce-connect-action@v1
-      with:
-        username: ${{ secrets.SAUCE_USERNAME }}
-        accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
-        tunnelIdentifier: ${{ steps.sauce_strings.outputs.tunnel_id }}
-
-    - name: Run the frontend tests
-      shell: bash
-      env:
-        SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
-        SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
-        SAUCE_NAME: ${{ steps.sauce_strings.outputs.name }}
-        TRAVIS_JOB_NUMBER: ${{ steps.sauce_strings.outputs.tunnel_id }}
-        GIT_HASH: ${{ steps.environment.outputs.sha_short }}
-      run: |
-        src/tests/frontend/travis/runner.sh
-
-  withplugins:
+  collab:
     name: with plugins
     runs-on: ubuntu-latest
 
@@ -71,13 +22,6 @@ jobs:
       with:
         node-version: 12
 
-    - name: Install Etherpad plugins
-      # The --legacy-peer-deps flag is required to work around a bug in npm v7:
-      # https://github.com/npm/cli/issues/2199
-      run: >
-        npm install --no-save --legacy-peer-deps
-      # include any plugins here..
-
     # This must be run after installing the plugins, otherwise npm will try to
     # hoist common dependencies by removing them from src/node_modules and
     # installing them in the top-level node_modules. As of v6.14.10, npm's hoist
@@ -105,7 +49,7 @@ jobs:
         accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
         tunnelIdentifier: ${{ steps.sauce_strings.outputs.tunnel_id }}
 
-    - name: Run the frontend tests
+    - name: Run the frontend Collaboration tests
       shell: bash
       env:
         SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}