diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fb2df53b4..7b263f9bb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,13 +28,13 @@ jobs: strategy: matrix: os: [ubuntu-22.04] - scala: [3.3.4, 3.5.2] + scala: [3.3.4, 3.6.2] java: [corretto@11, corretto@17] project: [ldbcJS, ldbcNative, ldbcJVM] exclude: - project: ldbcJS java: corretto@17 - - scala: 3.5.2 + - scala: 3.6.2 java: corretto@17 - project: ldbcNative java: corretto@17 @@ -200,32 +200,32 @@ jobs: tar xf targets.tar rm targets.tar - - name: Download target directories (3.5.2, ldbcJS) + - name: Download target directories (3.6.2, ldbcJS) uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.5.2-ldbcJS + name: target-${{ matrix.os }}-${{ matrix.java }}-3.6.2-ldbcJS - - name: Inflate target directories (3.5.2, ldbcJS) + - name: Inflate target directories (3.6.2, ldbcJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.5.2, ldbcNative) + - name: Download target directories (3.6.2, ldbcNative) uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.5.2-ldbcNative + name: target-${{ matrix.os }}-${{ matrix.java }}-3.6.2-ldbcNative - - name: Inflate target directories (3.5.2, ldbcNative) + - name: Inflate target directories (3.6.2, ldbcNative) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.5.2, ldbcJVM) + - name: Download target directories (3.6.2, ldbcJVM) uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.5.2-ldbcJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-3.6.2-ldbcJVM - - name: Inflate target directories (3.5.2, ldbcJVM) + - name: Inflate target directories (3.6.2, ldbcJVM) run: | tar xf targets.tar rm targets.tar diff --git a/build.sbt b/build.sbt index 6dadfc8b6..20dc1c0c6 100644 --- a/build.sbt +++ b/build.sbt @@ -16,7 +16,7 @@ ThisBuild / tlBaseVersion := LdbcVersions.latest ThisBuild / tlFatalWarnings := true ThisBuild / projectName := "ldbc" ThisBuild / scalaVersion := scala3 -ThisBuild / crossScalaVersions := Seq(scala3, scala35) +ThisBuild / crossScalaVersions := Seq(scala3, scala36) ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.corretto(java11), JavaSpec.corretto(java17)) ThisBuild / githubWorkflowBuildPreamble ++= List(dockerRun) ++ nativeBrewInstallWorkflowSteps.value ThisBuild / nativeBrewInstallCond := Some("matrix.project == 'ldbcNative'") diff --git a/project/Versions.scala b/project/Versions.scala index 443fd5b01..47623ef53 100644 --- a/project/Versions.scala +++ b/project/Versions.scala @@ -11,7 +11,7 @@ object LdbcVersions { object ScalaVersions { val scala2 = "2.12.19" val scala3 = "3.3.4" - val scala35 = "3.5.2" + val scala36 = "3.6.2" } object JavaVersions {