Skip to content

Commit 7733bff

Browse files
authored
Merge pull request #53 from armanbilge/update/js-dom-19.0.0
Update JSDOM, improve CI infrastructure
2 parents 7fbe516 + b9281be commit 7733bff

File tree

5 files changed

+788
-118
lines changed

5 files changed

+788
-118
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 & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +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
62+
node-version: 16
63+
cache: npm
6364

6465
- name: Install jsdom
6566
if: matrix.ci == 'ciJSDOMNodeJS'

build.sbt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,17 @@ 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"),
55-
cond = Some("matrix.ci == 'ciNode' || matrix.ci == 'ciJSDOMNodeJS'")),
52+
UseRef.Public("actions", "setup-node", "v3"),
53+
name = Some("Setup NodeJS v16 LTS"),
54+
params = Map("node-version" -> "16", "cache" -> "npm"),
55+
cond = Some("matrix.ci == 'ciNode' || matrix.ci == 'ciJSDOMNodeJS'"),
56+
),
5657
WorkflowStep.Run(
5758
List("npm install"),
5859
name = Some("Install jsdom"),
59-
cond = Some("matrix.ci == 'ciJSDOMNodeJS'")))
60+
cond = Some("matrix.ci == 'ciJSDOMNodeJS'"),
61+
),
62+
)
6063

6164
val ciVariants = List("ciNode", "ciFirefox", "ciChrome", "ciJSDOMNodeJS")
6265

0 commit comments

Comments
 (0)