Skip to content

Commit

Permalink
Merge pull request #352 from takapi327/dependencies/2025-01-Update-sc…
Browse files Browse the repository at this point in the history
…ala3-compiler-3.6.2

Dependencies/2025 01 update scala3 compiler 3.6.2
  • Loading branch information
takapi327 authored Jan 2, 2025
2 parents 12f3b56 + 80eaa46 commit 125149a
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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'")
Expand Down
2 changes: 1 addition & 1 deletion project/Versions.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 125149a

Please sign in to comment.