Merge pull request #1120 from japgolly/fix_ci

Author: japgolly

.github/workflows/ci.yml

@@ -20,9 +20,11 @@ jobs:
         include:
           - java: 18.0.1
             scala: 2
+            node: 24.10.0
           - java: 11.0.15
             scala: 3
-    name: Scala v${{ matrix.scala }} / Java v${{ matrix.java }}
+            node: 18.20.8
+    name: Scala v${{ matrix.scala }} / Java v${{ matrix.java }} / Node v${{ matrix.node }}
     steps:
 
       - name: Git checkout
@@ -34,6 +36,8 @@ jobs:
         uses: japgolly/[email protected]
         with:
           java-version: adoptium@1.${{ matrix.java }}
+          jsdom-version: 26.1.0
+          node-version: ${{ matrix.node }}
 
       - name: Build and test
         shell: bash

.gitignore

@@ -16,6 +16,5 @@
 ~*
 metals.sbt
 node_modules/
-package-lock.json
 target
-.direnv/
+.direnv/

bin/ci

@@ -33,9 +33,26 @@ dryrun=
 # dryrun=-n
 
 # See how much memory is available
-free -h
+if [ "$(uname)" == "Darwin" ]; then # https://apple.stackexchange.com/a/94258
+  vm_stat | perl -ne '/page size of (\d+)/ and $size=$1; /Pages\s+([^:]+)[^\d]+(\d+)/ and printf("%-16s % 16.2f Mi\n", "$1:", $2 * $size / 1048576);'
+elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
+  free -h
+fi
+echo
+
+# Show versions
+java -version
+echo
+echo "Node $(node --version)"
 echo
 
+# Configure jsdom
+cmd=(npm install)
+echo "> $(printf "%s\n    " "${cmd[@]}")"
+[[ $dryrun == "-n" ]] || "${cmd[@]}"
+npm -g list
+npm list
+
 # Test upstream
 rm -rf */target/scala-*/{,test-}classes
 cmd=(

downstream-tests/run

@@ -18,7 +18,7 @@ all_tests_values=(
   "-Ddownstream_tests.fullOptJS -Ddownstream_tests.reusability.dev=overlay"
 )
 all_tests_keys=()
-declare -A all_tests
+declare -a all_tests
 i=0
 for t in "${all_tests_values[@]}"; do
   i=$((i+1))