From f1e5f224231fbc517590f49a432e9d95489a1cbf Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Mon, 9 Jan 2023 09:57:12 +0000
Subject: [PATCH] chore(tests): Enable testing on node.js v18.x on GitHub CI
 (#6619)

* chore(tests): Enable testing on node.js v18.x on GitHub CI

* chore(tests): Remove outdated calls to test:prepare npm script

The calls to `npm run test:prepare` in `tests/scripts/setup_*_env.sh`
should have been removed along with that npm script in PR #4906.

* chore(deps): Fix alphabetisation in package.json
---
 .github/workflows/build.yml      | 5 +++--
 package.json                     | 2 +-
 tests/scripts/setup_linux_env.sh | 1 -
 tests/scripts/setup_osx_env.sh   | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 754aa4c11..2414a9984 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,8 +17,9 @@ jobs:
         # TODO (#2114): re-enable osx build.
         # os: [ubuntu-latest, macos-latest]
         os: [ubuntu-latest]
-        node-version: [14.x, 16.x]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+        node-version: [14.x, 16.x, 18.x]
+        # See supported Node.js release schedule at
+        # https://nodejs.org/en/about/releases/
 
     steps:
     - uses: actions/checkout@v3
diff --git a/package.json b/package.json
index 9dadaf9a5..0f3750183 100644
--- a/package.json
+++ b/package.json
@@ -89,8 +89,8 @@
     "gulp": "^4.0.2",
     "gulp-clang-format": "^1.0.27",
     "gulp-concat": "^2.6.1",
-    "gulp-header": "^2.0.9",
     "gulp-gzip": "^1.4.2",
+    "gulp-header": "^2.0.9",
     "gulp-insert": "^0.5.0",
     "gulp-rename": "^2.0.0",
     "gulp-replace": "^1.0.0",
diff --git a/tests/scripts/setup_linux_env.sh b/tests/scripts/setup_linux_env.sh
index 3a24ac784..a27c53c77 100755
--- a/tests/scripts/setup_linux_env.sh
+++ b/tests/scripts/setup_linux_env.sh
@@ -4,5 +4,4 @@ if [ "${RUNNER_OS}" == "Linux" ]
   then
     Xvfb :99 &
     export DISPLAY=:99 &
-    npm run test:prepare > /dev/null &
 fi
diff --git a/tests/scripts/setup_osx_env.sh b/tests/scripts/setup_osx_env.sh
index 9b32d5564..76c3461f9 100755
--- a/tests/scripts/setup_osx_env.sh
+++ b/tests/scripts/setup_osx_env.sh
@@ -3,5 +3,4 @@
 if [ "${RUNNER_OS}" == "macOS" ]
   then
     export CHROME_BIN="/Applications/Google Chrome.app"
-    npm run test:prepare > /dev/null &
 fi