diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index d90c3144f..b143e707b 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -8,7 +8,8 @@ name: Deploy Docs on: push: - branches: [$default-branch] + branches: + - master workflow_dispatch: permissions: diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 7c3dc7f59..7195de3ac 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -3,7 +3,7 @@ name: python-pypi-publish on: push: branches: - - main + - master tags: - "*.*.*" diff --git a/.github/workflows/scala-publish.yml b/.github/workflows/scala-publish.yml index 9da6b377c..0881d3224 100644 --- a/.github/workflows/scala-publish.yml +++ b/.github/workflows/scala-publish.yml @@ -3,10 +3,17 @@ name: scala-central-publish on: push: branches: - - main + - master tags: - "*.*.*" +# In the case of pushing the tag, it will publish the release. +# In the case of pushing to the main, it will publish the SNAPSHOT + +# From the docs (https://github.com/sbt/sbt-ci-release): +# - git tag pushes are published as regular releases to Maven Central +# - merge into main commits are published as -SNAPSHOT with a unique version number for every commit + jobs: release: strategy: @@ -25,14 +32,12 @@ jobs: fetch-depth: 0 # sbt-git requires the full history to determine the version - name: Set up JDK - if: startsWith(github.ref, 'refs/tags/') uses: actions/setup-java@v4 with: java-version: "${{ matrix.java-version }}" distribution: 'zulu' - name: Run the release of core - if: startsWith(github.ref, 'refs/tags/') run: build/sbt -Dspark.version=${{ matrix.spark-version }} +ci-release "project connect" +ci-release env: PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} diff --git a/build.sbt b/build.sbt index 925365dfa..76663e31e 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,3 @@ -import xerial.sbt.Sonatype.sonatypeCentralHost - lazy val sparkVer = sys.props.getOrElse("spark.version", "3.5.5") lazy val sparkMajorVer = sparkVer.substring(0, 1) lazy val sparkBranch = sparkVer.substring(0, 3) @@ -38,6 +36,7 @@ ThisBuild / scmInfo := Some( ScmInfo( url("https://github.com/graphframes/graphframes"), "scm:git@github.com:graphframes/graphframes.git")) +// The list of active maintainers with Write/Maintain/Admin access ThisBuild / developers := List( Developer( id = "rjurney", @@ -48,7 +47,13 @@ ThisBuild / developers := List( id = "SemyonSinchenko", name = "Sem", email = "ssinchenko@apache.org", - url = url("https://github.com/SemyonSinchenko"))) + url = url("https://github.com/SemyonSinchenko")), + Developer( + id = "james-willis", + name = "James Willis", + email = "jimwillis95@gmail.com", + url = url("https://github.com/james-willis")) +) ThisBuild / sonatypeCredentialHost := "s01.oss.sonatype.org" ThisBuild / sonatypeRepository := "https://s01.oss.sonatype.org/service/local" ThisBuild / sonatypeProfileName := "io.graphframes"