From d0409fef66f1e3dcfc9c82a3a24c8e695cdb0751 Mon Sep 17 00:00:00 2001
From: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
Date: Fri, 4 Jun 2021 12:44:53 +0200
Subject: [PATCH] test: enable testing for upcoming challenges

---
 .github/workflows/node.js-tests-upcoming.yml | 101 -------------------
 .github/workflows/node.js-tests.yml          |   4 +-
 2 files changed, 3 insertions(+), 102 deletions(-)
 delete mode 100644 .github/workflows/node.js-tests-upcoming.yml

diff --git a/.github/workflows/node.js-tests-upcoming.yml b/.github/workflows/node.js-tests-upcoming.yml
deleted file mode 100644
index 1b866e7686..0000000000
--- a/.github/workflows/node.js-tests-upcoming.yml
+++ /dev/null
@@ -1,101 +0,0 @@
-name: Node.js CI - Test Upcoming
-on:
-  push:
-    branches:
-      # Treat the below branches as special case for working on workflows
-      - actions-**
-      - upcoming-**
-  schedule:
-    # run this Action every 14 days
-    - cron: '0 * */14 * *'
-  workflow_dispatch:
-
-jobs:
-  lint:
-    name: Lint
-    runs-on: ubuntu-18.04
-
-    strategy:
-      matrix:
-        node-version: [14.x]
-
-    steps:
-      - name: Checkout Source Files
-        uses: actions/checkout@v2
-
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
-        with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Cache node modules
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-node-modules
-        with:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
-      - name: Set Environment variables
-        run: |
-          cp sample.env .env
-          echo 'SHOW_UPCOMING_CHANGES=true' >> .env
-          cat .env
-
-      - name: Lint Source Files
-        run: |
-          npm ci
-          npm run ensure-env
-          npm run build:curriculum
-          npm run lint
-
-  test:
-    name: Test
-    needs: lint
-    runs-on: ubuntu-18.04
-
-    strategy:
-      matrix:
-        node-version: [14.x]
-
-    steps:
-      - name: Checkout Source Files
-        uses: actions/checkout@v2
-
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
-        with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Cache node modules
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-node-modules
-        with:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
-      - name: Set Environment variables
-        run: |
-          cp sample.env .env
-          echo 'SHOW_UPCOMING_CHANGES=true' >> .env
-          cat .env
-
-      - name: Install Dependencies
-        run: |
-          npm ci
-          npm run ensure-env
-          npm run build:curriculum
-
-      - name: Run Tests
-        run: npm test
diff --git a/.github/workflows/node.js-tests.yml b/.github/workflows/node.js-tests.yml
index e5b95f56d0..ed1f2524d2 100644
--- a/.github/workflows/node.js-tests.yml
+++ b/.github/workflows/node.js-tests.yml
@@ -37,7 +37,9 @@ jobs:
             ${{ runner.os }}-
 
       - name: Set Environment variables
-        run: cp sample.env .env
+        run: |
+          cp sample.env .env
+          echo 'SHOW_UPCOMING_CHANGES=true' >> .env
 
       - name: Lint Source Files
         run: |