Skip to content

Commit 4bbde20

Browse files
authored
Merge pull request #767 from AVSystem/ci-update
Update CI configuration and dependencies
2 parents 3f479bc + a77cfcb commit 4bbde20

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@ on:
1616

1717
env:
1818
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
19+
JAVA_OPTS: '-Dfile.encoding=UTF-8 -Xmx4G'
1920

2021
jobs:
2122
build:
2223
name: Build and Test
2324
strategy:
25+
fail-fast: false
2426
matrix:
2527
os: [ubuntu-latest]
2628
scala: [2.13.16]
@@ -60,12 +62,10 @@ jobs:
6062
uses: sbt/setup-sbt@v1
6163

6264
- name: Setup Node.js
63-
uses: actions/setup-node@v2
64-
with:
65-
node-version: 12
65+
uses: actions/setup-node@v4
6666

6767
- name: Setup MongoDB
68-
uses: supercharge/[email protected].0
68+
uses: supercharge/[email protected].1
6969
with:
7070
mongodb-version: 8.0
7171
mongodb-replica-set: test-rs

project/Commons.scala

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,30 +66,27 @@ object Commons extends ProjectGroup("commons") {
6666
),
6767

6868
scalaVersion := "2.13.16",
69-
compileOrder := CompileOrder.Mixed,
7069

7170
githubWorkflowTargetTags ++= Seq("v*"),
72-
7371
githubWorkflowArtifactUpload := false,
7472
githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17"), JavaSpec.temurin("21"), JavaSpec.temurin("25")),
73+
githubWorkflowEnv += "JAVA_OPTS" -> "-Dfile.encoding=UTF-8 -Xmx4G",
74+
githubWorkflowBuildMatrixFailFast := Some(false),
7575
githubWorkflowBuildPreamble ++= Seq(
7676
WorkflowStep.Use(
77-
UseRef.Public("actions", "setup-node", "v2"),
77+
UseRef.Public("actions", "setup-node", "v4"),
7878
name = Some("Setup Node.js"),
79-
params = Map("node-version" -> "12")
8079
),
8180
WorkflowStep.Use(
82-
UseRef.Public("supercharge", "mongodb-github-action", "1.12.0"),
81+
UseRef.Public("supercharge", "mongodb-github-action", "1.12.1"),
8382
name = Some("Setup MongoDB"),
8483
params = Map(
8584
"mongodb-version" -> "8.0",
8685
"mongodb-replica-set" -> "test-rs",
8786
)
8887
),
8988
),
90-
9189
githubWorkflowPublishTargetBranches := Seq(RefPredicate.StartsWith(Ref.Tag("v"))),
92-
9390
githubWorkflowPublish := Seq(WorkflowStep.Sbt(
9491
List("ci-release"),
9592
env = Map(

0 commit comments

Comments
 (0)