Skip to content

Commit d76eb88

Browse files
committed
Update JSDOM, improve CI infrastructure
1 parent 7fbe516 commit d76eb88

File tree

5 files changed

+784
-124
lines changed

5 files changed

+784
-124
lines changed

.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "npm"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"

.github/workflows/ci.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,12 @@ jobs:
5555
~/Library/Caches/Coursier/v1
5656
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
5757

58-
- name: Setup NodeJS v14 LTS
58+
- name: Setup NodeJS v16 LTS
5959
if: matrix.ci == 'ciNode' || matrix.ci == 'ciJSDOMNodeJS'
60-
uses: actions/setup-node@v2.1.2
60+
uses: actions/setup-node@v3
6161
with:
62-
node-version: 14
63-
64-
- name: Install jsdom
65-
if: matrix.ci == 'ciJSDOMNodeJS'
66-
run: npm install
62+
node-version: 16
63+
cache: npm
6764

6865
- name: Check that workflows are up to date
6966
run: sbt ++${{ matrix.scala }} githubWorkflowCheck

build.sbt

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,11 @@ ThisBuild / crossScalaVersions := Seq("2.11.12", "2.12.15", "2.13.7", "3.0.2")
4949

5050
ThisBuild / githubWorkflowBuildPreamble ++= Seq(
5151
WorkflowStep.Use(
52-
UseRef.Public("actions", "setup-node", "v2.1.2"),
53-
name = Some("Setup NodeJS v14 LTS"),
54-
params = Map("node-version" -> "14"),
52+
UseRef.Public("actions", "setup-node", "v3"),
53+
name = Some("Setup NodeJS v16 LTS"),
54+
params = Map("node-version" -> "16", "cache" -> "npm"),
5555
cond = Some("matrix.ci == 'ciNode' || matrix.ci == 'ciJSDOMNodeJS'")),
56-
WorkflowStep.Run(
57-
List("npm install"),
58-
name = Some("Install jsdom"),
59-
cond = Some("matrix.ci == 'ciJSDOMNodeJS'")))
56+
)
6057

6158
val ciVariants = List("ciNode", "ciFirefox", "ciChrome", "ciJSDOMNodeJS")
6259

0 commit comments

Comments
 (0)