Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 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
6 changes: 3 additions & 3 deletions .github/workflows/scala-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ jobs:
~/.ivy2/cache
key: sbt-ivy-cache-spark-${{ matrix.spark-version}}-java-${{ matrix.java-version }}
- name: Check scalafmt
run: build/sbt -Dspark.version=${{ matrix.spark-version }} root/scalafmtCheckAll connect/scalafmtCheckAll
run: build/sbt -Dspark.version=${{ matrix.spark-version }} core/scalafmtCheckAll connect/scalafmtCheckAll
Comment thread
SemyonSinchenko marked this conversation as resolved.
Outdated
- name: Check scalastyle
run: build/sbt -Dspark.version=${{ matrix.spark-version }} root/scalafixAll connect/scalafixAll
run: build/sbt -Dspark.version=${{ matrix.spark-version }} core/scalafixAll connect/scalafixAll
Comment thread
SemyonSinchenko marked this conversation as resolved.
Outdated
- name: Build and Test
run: build/sbt -v -Dspark.version=${{ matrix.spark-version }} coverage +test coverageReport "project connect" coverage +test coverageReport
run: build/sbt -v -Dspark.version=${{ matrix.spark-version }} "project core" coverage +test coverageReport "project connect" coverage +test coverageReport
Comment thread
SemyonSinchenko marked this conversation as resolved.
Outdated
- uses: codecov/codecov-action@v3
2 changes: 1 addition & 1 deletion .github/workflows/scala-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
distribution: 'zulu'

- name: Run the release of core
run: build/sbt -Dspark.version=${{ matrix.spark-version }} +ci-release "project connect" +ci-release
run: build/sbt -Dspark.version=${{ matrix.spark-version }} ci-release
env:
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
PGP_SECRET: ${{ secrets.PGP_SECRET }}
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ lazy val commonSetting = Seq(
else
"-Wunused:imports"))

lazy val root = (project in file("."))
lazy val core = (project in file("graphframes-core"))
.settings(
commonSetting,
name := "graphframes",
Expand All @@ -123,7 +123,7 @@ lazy val root = (project in file("."))
Compile / packageSrc / publishArtifact := true)

lazy val connect = (project in file("graphframes-connect"))
.dependsOn(root)
.dependsOn(core)
.settings(
name := s"graphframes-connect",
moduleName := s"${name.value}-spark${sparkMajorVer}",
Expand Down
4 changes: 2 additions & 2 deletions python/dev/build_jar.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ def build(spark_versions: Sequence[str] = ["3.5.5"]):
sbt_build_command = [
sbt_executable,
f"-Dspark.version={spark_version}",
"clean",
"package",
"core/clean",
"core/package",
"connect/clean",
"connect/package"
]
Expand Down
2 changes: 1 addition & 1 deletion python/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def get_gf_jar_locations() -> Tuple[str, str]:
this function will raise an exception!
"""
project_root = pathlib.Path(__file__).parent.parent.parent
core_dir = project_root / "target" / f"scala-{scala_version}"
core_dir = project_root / "graphframes-core" / "target" / f"scala-{scala_version}"
connect_dir = project_root / "graphframes-connect" / "target" / f"scala-{scala_version}"

core_jar: Optional[str] = None
Expand Down