Skip to content

Commit 61eb81e

Browse files
committed
CI test check
1 parent 7ea6451 commit 61eb81e

File tree

15 files changed

+21
-202
lines changed

15 files changed

+21
-202
lines changed

.github/workflows/ci.yml

+8-5
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
name: Test
2828
strategy:
2929
matrix:
30-
os: [ubuntu-22.04]
30+
os: [ubuntu-20.04]
3131
scala: [3.3.5, 3.6.4]
3232
java: [corretto@11, corretto@17, corretto@21]
3333
project: [ldbcJS, ldbcNative, ldbcJVM]
@@ -94,6 +94,9 @@ jobs:
9494
if: matrix.java == 'corretto@21' && steps.setup-java-corretto-21.outputs.cache-hit == 'false'
9595
run: sbt +update
9696

97+
- name: Generate SSL certificates
98+
run: ./script/generate-ssl-certs.sh
99+
97100
- name: Start up MySQL on Docker
98101
run: docker compose up -d
99102

@@ -105,7 +108,7 @@ jobs:
105108
run: sbt githubWorkflowCheck
106109

107110
- name: Check headers and formatting
108-
if: matrix.java == 'corretto@11' && matrix.os == 'ubuntu-22.04'
111+
if: matrix.java == 'corretto@11' && matrix.os == 'ubuntu-20.04'
109112
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
110113

111114
- name: scalaJSLink
@@ -120,11 +123,11 @@ jobs:
120123
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
121124

122125
- name: Check binary compatibility
123-
if: matrix.java == 'corretto@11' && matrix.os == 'ubuntu-22.04'
126+
if: matrix.java == 'corretto@11' && matrix.os == 'ubuntu-20.04'
124127
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues
125128

126129
- name: Generate API documentation
127-
if: matrix.java == 'corretto@11' && matrix.os == 'ubuntu-22.04'
130+
if: matrix.java == 'corretto@11' && matrix.os == 'ubuntu-20.04'
128131
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc
129132

130133
- name: Stop MySQL on Docker
@@ -151,7 +154,7 @@ jobs:
151154
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v'))
152155
strategy:
153156
matrix:
154-
os: [ubuntu-22.04]
157+
os: [ubuntu-20.04]
155158
java: [corretto@11]
156159
runs-on: ${{ matrix.os }}
157160
steps:

build.sbt

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@ ThisBuild / tlFatalWarnings := true
1717
ThisBuild / projectName := "ldbc"
1818
ThisBuild / scalaVersion := scala3
1919
ThisBuild / crossScalaVersions := Seq(scala3, scala36)
20+
ThisBuild / githubWorkflowOSes := Seq("ubuntu-20.04")
2021
ThisBuild / githubWorkflowJavaVersions := Seq(
2122
JavaSpec.corretto(java11),
2223
JavaSpec.corretto(java17),
2324
JavaSpec.corretto(java21)
2425
)
25-
ThisBuild / githubWorkflowBuildPreamble ++= List(dockerRun) ++ nativeBrewInstallWorkflowSteps.value
26+
ThisBuild / githubWorkflowBuildPreamble ++= List(generateSSLCerts, dockerRun) ++ nativeBrewInstallWorkflowSteps.value
2627
ThisBuild / nativeBrewInstallCond := Some("matrix.project == 'ldbcNative'")
2728
ThisBuild / githubWorkflowAddedJobs ++= Seq(sbtScripted.value)
2829
ThisBuild / githubWorkflowBuildPostamble += dockerStop

database/my.cnf

+5
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
11
[mysqld]
22
mysql_native_password=on
3+
4+
# SSL Configuration
5+
ssl_ca=/etc/mysql/ssl/ca.pem
6+
ssl_cert=/etc/mysql/ssl/server-cert.pem
7+
ssl_key=/etc/mysql/ssl/server-key.pem

database/ssl/ca-key.pem

-28
This file was deleted.

database/ssl/ca.pem

-19
This file was deleted.

database/ssl/client-cert.pem

-18
This file was deleted.

database/ssl/client-key.pem

-28
This file was deleted.

database/ssl/client-req.pem

-15
This file was deleted.

database/ssl/my.cnf

-7
This file was deleted.

database/ssl/server-cert.pem

-18
This file was deleted.

database/ssl/server-key.pem

-28
This file was deleted.

database/ssl/server-req.pem

-15
This file was deleted.

docker-compose.yml

+1-20
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,7 @@ services:
1111
- 13306:3306
1212
volumes:
1313
- ./database:/docker-entrypoint-initdb.d
14-
- ./database/ssl/my.cnf:/etc/mysql/conf.d/my.cnf
15-
- ./database/ssl:/etc/mysql/ssl
16-
healthcheck:
17-
test: [ "CMD", "mysqladmin", "ping", "-h", "localhost" ]
18-
timeout: 20s
19-
retries: 10
20-
21-
mysql-ssl:
22-
image: mysql:8.4.0
23-
container_name: ldbc_ssl
24-
platform: linux/amd64
25-
environment:
26-
MYSQL_USER: 'ldbc'
27-
MYSQL_PASSWORD: 'password'
28-
MYSQL_ROOT_PASSWORD: 'root'
29-
ports:
30-
- 13307:3306
31-
volumes:
32-
- ./database:/docker-entrypoint-initdb.d
33-
- ./database/ssl/my.cnf:/etc/mysql/conf.d/my.cnf
14+
- ./database/my.cnf:/etc/mysql/conf.d/my.cnf
3415
- ./database/ssl:/etc/mysql/ssl
3516
healthcheck:
3617
test: [ "CMD", "mysqladmin", "ping", "-h", "localhost" ]
Binary file not shown.

project/Workflows.scala

+5
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ object Workflows {
3232
)
3333
)
3434

35+
val generateSSLCerts: WorkflowStep.Run = WorkflowStep.Run(
36+
commands = List("./script/generate-ssl-certs.sh"),
37+
name = Some("Generate SSL certificates")
38+
)
39+
3540
val dockerRun: WorkflowStep.Run = WorkflowStep.Run(
3641
commands = List("docker compose up -d"),
3742
name = Some("Start up MySQL on Docker")

0 commit comments

Comments
 (0)