From f2ba7c51a61c6fc3c36128265a14b593fc098560 Mon Sep 17 00:00:00 2001
From: Crossedfall <ping@crossedfall.io>
Date: Tue, 24 Oct 2023 14:18:14 -0500
Subject: [PATCH] Updates the CI to use a system supplied node to cut down on
 NodeJS ratelimits (#10088)

* Updates the CI to use a system supplied node

* Converts the linux workflows as well

* No longer need to run the install node script
---
 .github/workflows/continuous_integration.yml | 44 +++++++-------------
 1 file changed, 14 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
index 1be9423e9c5b3..96e829e4e8e45 100644
--- a/.github/workflows/continuous_integration.yml
+++ b/.github/workflows/continuous_integration.yml
@@ -23,6 +23,11 @@ jobs:
         with:
           python-version: "3.11"
           cache: 'pip'
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: yarn
+          cache-dependency-path: tgui/yarn.lock
       - name: Cache SpacemanDMM
         id: cache-spacemandmm
         uses: actions/cache@v3
@@ -35,18 +40,7 @@ jobs:
       - name: Install Tools
         run: |
           pip install setuptools
-          bash tools/ci/install_node.sh
           pip install -r tools/requirements.txt
-      - name: Cache Yarn
-        id: cache-yarn
-        uses: actions/cache@v3
-        with:
-          path: tgui/.yarn
-          key: ${{ runner.os }}-yarn-cache-${{ hashFiles('tgui/yarn.lock') }}
-      - name: TGUI fetch
-        if: steps.cache-yarn.outputs.cache-hit != 'true'
-        run: |
-          tools/build/build --ci yarn
       - name: Run Linters
         run: |
           bash tools/ci/check_filedirs.sh beestation.dme
@@ -88,6 +82,11 @@ jobs:
         options: --health-cmd="mariadb-admin ping" --health-interval=10s --health-timeout=5s --health-retries=3
     steps:
       - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: yarn
+          cache-dependency-path: tgui/yarn.lock
       - name: Cache BYOND
         id: cache-byond
         uses: actions/cache@v3
@@ -111,16 +110,6 @@ jobs:
       - name: Install auxmos
         run: |
           bash tools/ci/install_auxmos.sh
-      - name: Cache Yarn
-        id: cache-yarn
-        uses: actions/cache@v3
-        with:
-          path: tgui/.yarn
-          key: ${{ runner.os }}-yarn-cache-${{ hashFiles('tgui/yarn.lock') }}
-      - name: TGUI fetch
-        if: steps.cache-yarn.outputs.cache-hit != 'true'
-        run: |
-          tools/build/build --ci yarn
       - name: Compile and run tests
         run: |
           source $HOME/BYOND/byond/bin/byondsetup
@@ -130,22 +119,17 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Cache Yarn
-        id: cache-yarn
-        uses: actions/cache@v3
+      - uses: actions/setup-node@v3
         with:
-          path: tgui/.yarn
-          key: ${{ runner.os }}-yarn-cache-${{ hashFiles('tgui/yarn.lock') }}
+          node-version: 18
+          cache: yarn
+          cache-dependency-path: tgui/yarn.lock
       - name: Cache BYOND
         id: cache-byond
         uses: actions/cache@v3
         with:
           path: C:/byond
           key: ${{ runner.os }}-byond-cache-${{ hashFiles('dependencies.sh') }}
-      - name: TGUI fetch
-        if: steps.cache-yarn.outputs.cache-hit != 'true'
-        run: |
-          tools/build/build --ci yarn
       - name: Compile
         run: pwsh tools/ci/build.ps1
         env: