Skip to content

Commit aae22b5

Browse files
try sbt-ci-release-early
1 parent 7dffd60 commit aae22b5

File tree

3 files changed

+21
-16
lines changed

3 files changed

+21
-16
lines changed

.github/workflows/release.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
1-
name: Release
1+
name: release
2+
concurrency: release
23
on:
34
push:
45
branches: [master, main]
5-
tags: ["**"]
6+
tags: ["*"]
67
jobs:
7-
publish:
8+
release:
89
runs-on: ubuntu-latest
910
steps:
1011
- uses: actions/checkout@v4
1112
with:
1213
fetch-depth: 0
13-
- uses: actions/setup-java@v5
14+
- name: Setup JDK
15+
uses: actions/setup-java@v4
1416
with:
1517
distribution: temurin
1618
java-version: 11
1719
cache: sbt
1820
- uses: sbt/setup-sbt@v1
19-
- run: sbt ci-release
21+
- run: sudo apt update && sudo apt install -y gnupg
22+
- run: echo $PGP_SECRET | base64 --decode | gpg --batch --import
2023
env:
21-
RELEASE_VERSION_BUMP: true
22-
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
2324
PGP_SECRET: ${{ secrets.PGP_SECRET }}
25+
- run: sbt +test ciReleaseSkipIfAlreadyReleased ciReleaseTagNextVersion ciReleaseSonatype
26+
env:
2427
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
25-
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
26-
CI_RELEASE: ${{ secrets.CI_RELEASE }}
28+
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}

build.sbt

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
import sbtrelease.ReleaseStateTransformations.*
22

33
Global / onChangedBuildSource := ReloadOnSourceChanges
4-
Global / excludeLintKeys := Set(git.useGitDescribe, crossScalaVersions)
4+
Global / excludeLintKeys := Set(crossScalaVersions)
55

66
lazy val rootScalaVersion = "3.3.6"
77
lazy val crossVersions = Seq("2.13.16", rootScalaVersion)
88
lazy val flinkVersion1 = System.getProperty("flinkVersion1", "1.20.2")
99
lazy val flinkVersion2 = System.getProperty("flinkVersion2", "2.0.0")
1010

11+
ThisBuild / publishTo := sonatypePublishToBundle.value
12+
1113
inThisBuild(
1214
List(
1315
organization := "com.github.sbt",
@@ -34,10 +36,11 @@ inThisBuild(
3436
"scm:[email protected]:flink-extended/flink-scala-api.git"
3537
)
3638
),
37-
organization := "org.flinkextended",
38-
description := "Community-maintained fork of official Apache Flink Scala API",
39-
licenses := Seq("APL2" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt")),
40-
homepage := Some(url("https://github.com/flink-extended/flink-scala-api"))
39+
organization := "org.flinkextended",
40+
description := "Community-maintained fork of official Apache Flink Scala API",
41+
licenses := Seq("APL2" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt")),
42+
homepage := Some(url("https://github.com/flink-extended/flink-scala-api")),
43+
sonatypeCredentialHost := "central.sonatype.com"
4144
)
4245
)
4346

@@ -74,7 +77,7 @@ lazy val commonSettings = Seq(
7477
val Some((major, _)) = CrossVersion.partialVersion(scalaVersion.value)
7578
file(s"$dir-$major")
7679
},
77-
scalacOptions ++= Seq (
80+
scalacOptions ++= Seq(
7881
"-deprecation",
7982
"-feature",
8083
"-language:higherKinds",

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.7.2")
55
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0")
66
// addSbtPlugin("com.github.sbt" % "sbt-git" % "2.1.0")
77
addSbtPlugin("com.github.sbt" % "sbt-protobuf" % "0.8.3")
8-
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2")
8+
addSbtPlugin("io.shiftleft" % "sbt-ci-release-early" % "2.1.11")

0 commit comments

Comments
 (0)