Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 16 additions & 33 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -594,95 +594,78 @@ jobs:
needs: changes
if: needs.changes.outputs.scala == 'true'
runs-on: ubuntu-latest
env:
FORY_SCALA_MAVEN_LOCAL: /tmp/fory-scala-m2/repository
steps:
- uses: actions/checkout@v5
- name: Set up JDK11
uses: actions/setup-java@v4
with:
java-version: 11
distribution: "temurin"
cache: sbt
- name: Cache Maven local repository
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- uses: sbt/setup-sbt@2e222825582620cc38d2a54e674f3c01b7c14f5d # v1.1.24
with:
disk-cache: false
- name: Install fory java
run: cd java && mvn -T10 --no-transfer-progress clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Dmaven.repo.local="$FORY_SCALA_MAVEN_LOCAL" && cd -
run: |
cd java
mvn -T10 --no-transfer-progress clean deploy -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DaltDeploymentRepository=fory-local::default::file://${RUNNER_TEMP}/fory-maven-repo
- name: Test
env:
SBT_OPTS: -Dfory.maven.repo=file://${{ runner.temp }}/fory-maven-repo
run: |
cd scala && sbt +test && cd -

scala_xlang:
name: Scala Xlang Test
runs-on: ubuntu-latest
env:
FORY_SCALA_MAVEN_LOCAL: /tmp/fory-scala-m2/repository
steps:
- uses: actions/checkout@v5
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: 21
distribution: "temurin"
cache: sbt
- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: 3.11
- name: Cache Maven local repository
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- uses: sbt/setup-sbt@2e222825582620cc38d2a54e674f3c01b7c14f5d # v1.1.24
with:
disk-cache: false
- name: Run Scala Xlang Test
env:
FORY_SCALA_JAVA_CI: "1"
ENABLE_FORY_DEBUG_OUTPUT: "1"
SBT_OPTS: -Dfory.maven.repo=file://${{ runner.temp }}/fory-maven-repo
run: |
cd java
mvn -T16 --no-transfer-progress clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Dmaven.repo.local="$FORY_SCALA_MAVEN_LOCAL"
mvn -T16 --no-transfer-progress clean deploy -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DaltDeploymentRepository=fory-local::default::file://${RUNNER_TEMP}/fory-maven-repo
cd fory-core
mvn -T16 --no-transfer-progress test -Dtest=org.apache.fory.xlang.ScalaXlangTest

scala_idl:
name: Scala IDL Tests
runs-on: ubuntu-latest
env:
FORY_SCALA_MAVEN_LOCAL: /tmp/fory-scala-m2/repository
steps:
- uses: actions/checkout@v5
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: 21
distribution: "temurin"
cache: sbt
- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: 3.11
- name: Cache Maven local repository
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- uses: sbt/setup-sbt@2e222825582620cc38d2a54e674f3c01b7c14f5d # v1.1.24
with:
disk-cache: false
- name: Install Fory Java
run: |
cd java
mvn -T16 --no-transfer-progress clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Dmaven.repo.local="$FORY_SCALA_MAVEN_LOCAL"
mvn -T16 --no-transfer-progress clean deploy -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DaltDeploymentRepository=fory-local::default::file://${RUNNER_TEMP}/fory-maven-repo
- name: Run Scala IDL Tests
env:
SBT_OPTS: -Dfory.maven.repo=file://${{ runner.temp }}/fory-maven-repo
run: ./integration_tests/idl_tests/run_scala_tests.sh

integration_tests:
Expand Down
10 changes: 7 additions & 3 deletions scala/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,17 @@

val foryVersion = "1.2.0-SNAPSHOT"
val scala213Version = "2.13.15"
val foryMavenLocal =
sys.env.get("FORY_SCALA_MAVEN_LOCAL").map(file).getOrElse(Path.userHome / ".m2" / "repository")
ThisBuild / apacheSonatypeProjectProfile := "fory"
version := foryVersion
scalaVersion := scala213Version
crossScalaVersions := Seq(scala213Version, "3.3.1")

val localForyResolver =
sys.props
.get("fory.maven.repo")
.map(repo => "Local Fory Maven Repository" at repo)
.getOrElse(Resolver.mavenLocal)

lazy val root = Project(id = "fory-scala", base = file("."))
.settings(
name := "fory-scala",
Expand All @@ -43,7 +47,7 @@ lazy val root = Project(id = "fory-scala", base = file("."))
ThisBuild / externalResolvers := Seq(
Resolver.mavenCentral,
Resolver.ApacheMavenSnapshotsRepo,
Resolver.file("fory-maven-local", foryMavenLocal)(Resolver.mavenStylePatterns),
localForyResolver,
)

libraryDependencies ++= Seq(
Expand Down
Loading