Skip to content

Commit 234d691

Browse files
authored
Attempt at Redis CI fix (#443)
Apparently Graal 21.1.0 has some issues with empty PKCS passwords
1 parent ec3858d commit 234d691

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

.github/workflows/ci.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@ jobs:
2525
matrix:
2626
os: [ubuntu-latest]
2727
scala: [2.13.10, 2.12.17]
28-
java: [graal_21.1.0@11, temurin@17]
28+
java: [temurin@11, temurin@17]
2929
runs-on: ${{ matrix.os }}
3030
steps:
3131
- name: Checkout current branch (full)
3232
uses: actions/checkout@v2
3333
with:
3434
fetch-depth: 0
3535

36-
- name: Setup GraalVM (graal_21.1.0@11)
37-
if: matrix.java == 'graal_21.1.0@11'
38-
uses: DeLaGuardo/setup-[email protected]
36+
- name: Setup Java (temurin@11)
37+
if: matrix.java == 'temurin@11'
38+
uses: actions/setup-java@v2
3939
with:
40-
graalvm: 21.1.0
41-
java: java11
40+
distribution: temurin
41+
java-version: 11
4242

4343
- name: Setup Java (temurin@17)
4444
if: matrix.java == 'temurin@17'
@@ -71,9 +71,9 @@ jobs:
7171
node-version: 12
7272

7373
- name: Setup MongoDB
74-
uses: supercharge/mongodb-github-action@1.7.0
74+
uses: supercharge/mongodb-github-action@1.9.0
7575
with:
76-
mongodb-version: 5.0.8
76+
mongodb-version: 6.0
7777
mongodb-replica-set: test-rs
7878

7979
- name: Setup Redis
@@ -102,20 +102,20 @@ jobs:
102102
matrix:
103103
os: [ubuntu-latest]
104104
scala: [2.13.10]
105-
java: [graal_21.1.0@11]
105+
java: [temurin@11]
106106
runs-on: ${{ matrix.os }}
107107
steps:
108108
- name: Checkout current branch (full)
109109
uses: actions/checkout@v2
110110
with:
111111
fetch-depth: 0
112112

113-
- name: Setup GraalVM (graal_21.1.0@11)
114-
if: matrix.java == 'graal_21.1.0@11'
115-
uses: DeLaGuardo/setup-[email protected]
113+
- name: Setup Java (temurin@11)
114+
if: matrix.java == 'temurin@11'
115+
uses: actions/setup-java@v2
116116
with:
117-
graalvm: 21.1.0
118-
java: java11
117+
distribution: temurin
118+
java-version: 11
119119

120120
- name: Setup Java (temurin@17)
121121
if: matrix.java == 'temurin@17'

project/Commons.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ object Commons extends ProjectGroup("commons") {
8080
githubWorkflowEnv ++= Map(
8181
"REDIS_VERSION" -> "6.2.12",
8282
),
83-
githubWorkflowJavaVersions := Seq(JavaSpec.graalvm("21.1.0", "11"), JavaSpec.temurin("17")),
83+
githubWorkflowJavaVersions := Seq(JavaSpec.temurin("11"), JavaSpec.temurin("17")),
8484
githubWorkflowBuildPreamble ++= Seq(
8585
WorkflowStep.Use(
8686
UseRef.Public("actions", "cache", "v2"),
@@ -96,10 +96,10 @@ object Commons extends ProjectGroup("commons") {
9696
params = Map("node-version" -> "12")
9797
),
9898
WorkflowStep.Use(
99-
UseRef.Public("supercharge", "mongodb-github-action", "1.7.0"),
99+
UseRef.Public("supercharge", "mongodb-github-action", "1.9.0"),
100100
name = Some("Setup MongoDB"),
101101
params = Map(
102-
"mongodb-version" -> "5.0.8",
102+
"mongodb-version" -> "6.0",
103103
"mongodb-replica-set" -> "test-rs",
104104
)
105105
),

0 commit comments

Comments
 (0)