Skip to content

Commit 066260f

Browse files
SemyonSinchenkoSemyonSinchenko
authored
chore: fix shading problems and slightly update CI (#615)
* **Update Scala CI workflows and build configurations** - Refactor `scala-publish.yml` to clarify release and snapshot publishing conditions. - Adjust `docs.yml` trigger to specifically include the `main` branch. - Remove unused Sonatype import from `build.sbt`. - Enhance developer metadata and maintainers list in `build.sbt`. - Update dependencies and assembly configuration to address shading and exclude non-connect classes for the Uber JAR. - Introduce custom POM post-processing for correct dependency scope adjustments. * Add missing developer email * Specify the scope for protobuf-java Added a post-processing to mark protobuf scope to "provided" because it is a part of Apache Spark itself. * Take everything from #617 * main -> master I always forgot that GF is uses master as a default branch...
1 parent e0180ba commit 066260f

4 files changed

Lines changed: 19 additions & 8 deletions

File tree

‎.github/workflows/docs.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ name: Deploy Docs
88

99
on:
1010
push:
11-
branches: [$default-branch]
11+
branches:
12+
- master
1213
workflow_dispatch:
1314

1415
permissions:

‎.github/workflows/python-publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: python-pypi-publish
33
on:
44
push:
55
branches:
6-
- main
6+
- master
77
tags:
88
- "*.*.*"
99

‎.github/workflows/scala-publish.yml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,17 @@ name: scala-central-publish
33
on:
44
push:
55
branches:
6-
- main
6+
- master
77
tags:
88
- "*.*.*"
99

10+
# In the case of pushing the tag, it will publish the release.
11+
# In the case of pushing to the main, it will publish the SNAPSHOT
12+
13+
# From the docs (https://github.com/sbt/sbt-ci-release):
14+
# - git tag pushes are published as regular releases to Maven Central
15+
# - merge into main commits are published as -SNAPSHOT with a unique version number for every commit
16+
1017
jobs:
1118
release:
1219
strategy:
@@ -25,14 +32,12 @@ jobs:
2532
fetch-depth: 0 # sbt-git requires the full history to determine the version
2633

2734
- name: Set up JDK
28-
if: startsWith(github.ref, 'refs/tags/')
2935
uses: actions/setup-java@v4
3036
with:
3137
java-version: "${{ matrix.java-version }}"
3238
distribution: 'zulu'
3339

3440
- name: Run the release of core
35-
if: startsWith(github.ref, 'refs/tags/')
3641
run: build/sbt -Dspark.version=${{ matrix.spark-version }} +ci-release "project connect" +ci-release
3742
env:
3843
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}

‎build.sbt‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import xerial.sbt.Sonatype.sonatypeCentralHost
2-
31
lazy val sparkVer = sys.props.getOrElse("spark.version", "3.5.5")
42
lazy val sparkMajorVer = sparkVer.substring(0, 1)
53
lazy val sparkBranch = sparkVer.substring(0, 3)
@@ -38,6 +36,7 @@ ThisBuild / scmInfo := Some(
3836
ScmInfo(
3937
url("https://github.com/graphframes/graphframes"),
4038
"scm:git@github.com:graphframes/graphframes.git"))
39+
// The list of active maintainers with Write/Maintain/Admin access
4140
ThisBuild / developers := List(
4241
Developer(
4342
id = "rjurney",
@@ -48,7 +47,13 @@ ThisBuild / developers := List(
4847
id = "SemyonSinchenko",
4948
name = "Sem",
5049
email = "ssinchenko@apache.org",
51-
url = url("https://github.com/SemyonSinchenko")))
50+
url = url("https://github.com/SemyonSinchenko")),
51+
Developer(
52+
id = "james-willis",
53+
name = "James Willis",
54+
email = "jimwillis95@gmail.com",
55+
url = url("https://github.com/james-willis"))
56+
)
5257
ThisBuild / sonatypeCredentialHost := "s01.oss.sonatype.org"
5358
ThisBuild / sonatypeRepository := "https://s01.oss.sonatype.org/service/local"
5459
ThisBuild / sonatypeProfileName := "io.graphframes"

0 commit comments

Comments
 (0)