diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ada425..f082940 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - spark: ["3.1.3","3.2.4", "3.3.4", "3.4.3", "3.5.1"] + spark: ["3.1.3","3.2.4", "3.3.4", "3.4.3", "3.5.3"] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -21,6 +21,6 @@ jobs: with: jvm: zulu:8 - name: Test - run: sbt -Dspark.testVersion=${{ matrix.spark }} +test + run: sbt -Dspark.version=${{ matrix.spark }} +test - name: Benchmark - run: sbt -Dspark.testVersion=${{ matrix.spark }} +benchmarks/Jmh/run + run: sbt -Dspark.version=${{ matrix.spark }} +benchmarks/Jmh/run diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..9596338 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,18 @@ +name: Release +on: + push: + tags: ["*"] +jobs: + publish: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: coursier/setup-action@v1 + with: + jvm: zulu:8 + - run: sbt ci-release -Dspark.version=3.5.3 + env: + PGP_PASSPHRASE: ${{secrets.PGP_PASSPHRASE}} + PGP_SECRET: ${{secrets.PGP_SECRET}} + SONATYPE_PASSWORD: ${{secrets.SONATYPE_PASSWORD}} + SONATYPE_USERNAME: ${{secrets.SONATYPE_USERNAME}} diff --git a/README.md b/README.md index 543ba23..da14f91 100644 --- a/README.md +++ b/README.md @@ -325,7 +325,7 @@ There is a two step process for publishing. Generate Scala 2.11 JAR files: -* Run `sbt -Dspark.testVersion=2.4.8` +* Run `sbt -Dspark.version=2.4.8` * Run `> ; + publishSigned; sonatypeBundleRelease` to create the JAR files and release them to Maven. Generate Scala 2.12 & Scala 2.13 JAR files: diff --git a/build.sbt b/build.sbt index 34f6ac3..5f3e5cc 100644 --- a/build.sbt +++ b/build.sbt @@ -11,7 +11,7 @@ val versionRegex = """^(.*)\.(.*)\.(.*)$""".r val scala2_13 = "2.13.14" val scala2_12 = "2.12.20" -val sparkVersion = System.getProperty("spark.testVersion", "3.5.1") +val sparkVersion = System.getProperty("spark.version", "3.5.3") crossScalaVersions := { sparkVersion match { case versionRegex("3", m, _) if m.toInt >= 2 => Seq(scala2_12, scala2_13) @@ -39,6 +39,8 @@ lazy val core = (project in file("core")) .settings( commonSettings, name := "core", + Compile / packageSrc / publishArtifact := true, + Compile / packageDoc / publishArtifact := true ) lazy val benchmarks = (project in file("benchmarks"))