Skip to content

Commit 39591d8

Browse files
committed
[Kaizen] Simplify lib release script
1 parent 67db780 commit 39591d8

File tree

1 file changed

+5
-16
lines changed

1 file changed

+5
-16
lines changed

.buildkite/publish.sh

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,30 +37,19 @@ export JAVA_OPTS="$JAVA_OPTS -Dsbt.gigahorse=false"
3737
# with `publish / skip := true` in build.sbt for the default project,
3838
# without any aggregation, by default it would publish nothing, so
3939
# let's tell it here by using `sbt-ci-release` env vars.
40-
# NOTE: +rlp/publishSigned with the `+` would cross publish,
41-
# but it doesn't work because of scapegoat (see below).
42-
export CI_SNAPSHOT_RELEASE="; bytes/publishSigned; rlp/publishSigned; crypto/publishSigned"
40+
export CI_SNAPSHOT_RELEASE="; +bytes/publishSigned; +rlp/publishSigned; +crypto/publishSigned"
4341
export CI_RELEASE=$CI_SNAPSHOT_RELEASE
44-
export CI_SONATYPE_RELEASE=$"; bytes/sonatypeBundleRelease; rlp/sonatypeBundleRelease; crypto/sonatypeBundleRelease"
4542

46-
# Scala 2.12 has up to scapegoat 1.4.5, while Scala 2.13 starts with 1.4.7.
47-
# I couldn't make build.sbt vary the scapegoat version by the current cross build,
48-
# so as a workaround the combos are called here explicitly.
4943
function release {
5044
SCALA_VERSION=$1
5145

52-
sbt "++ $SCALA_VERSION ; ci-release"
53-
}
54-
55-
function releaseAll {
56-
release 2.12.13
57-
release 2.13.6
46+
sbt ci-release
5847
}
5948

6049
if [[ "$BUILDKITE_BRANCH" == "develop" ]]; then
6150

6251
# Publish the -SNAPSHOT version.
63-
releaseAll
52+
release
6453

6554
elif [[ "$BUILDKITE_BRANCH" == "master" ]]; then
6655

@@ -69,9 +58,9 @@ elif [[ "$BUILDKITE_BRANCH" == "master" ]]; then
6958

7059
# Whether ci-release does a release or a snapshot depends on whether it thinks the build is tagged; setting a dummy value.
7160
# Check https://github.com/olafurpg/sbt-ci-release/blob/main/plugin/src/main/scala/com/geirsson/CiReleasePlugin.scala for the rules.
72-
export CI_COMMIT_TAG=$(sbt -Dsbt.supershell=false -error "print version")
61+
export CI_COMMIT_TAG=$(sbt -Dsbt.supershell=false -error "print version")
7362

74-
releaseAll
63+
release
7564

7665
else
7766

0 commit comments

Comments
 (0)