Skip to content

Commit d2a5077

Browse files
authored
Merge pull request #460 from SethTisue/tweak-build-dot-sh
accommodate non-cross-built modules in build.sh
2 parents 9a56cdd + ab664a5 commit d2a5077

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

build.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ isReleaseJob() {
2626
}
2727

2828
if [[ "$SCALAJS_VERSION" == "" ]]; then
29-
projectPrefix="xml"
29+
projectPrefix="xml/"
3030
else
31-
projectPrefix="xmlJS"
31+
projectPrefix="xmlJS/"
3232
fi
3333

3434
verPat="[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9-]+)?"
@@ -43,12 +43,12 @@ if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
4343
fi
4444

4545
# default is +publishSigned; we cross-build with travis jobs, not sbt's crossScalaVersions
46-
export CI_RELEASE="$projectPrefix/publishSigned"
47-
export CI_SNAPSHOT_RELEASE="$projectPrefix/publish"
46+
export CI_RELEASE="${projectPrefix}publishSigned"
47+
export CI_SNAPSHOT_RELEASE="${projectPrefix}publish"
4848

4949
# default is sonatypeBundleRelease, which closes and releases the staging repo
5050
# see https://github.com/xerial/sbt-sonatype#commands
5151
# for now, until we're confident in the new release scripts, just close the staging repo.
5252
export CI_SONATYPE_RELEASE="; sonatypePrepare; sonatypeBundleUpload; sonatypeClose"
5353

54-
sbt clean $projectPrefix/test $projectPrefix/publishLocal $releaseTask
54+
sbt clean ${projectPrefix}test ${projectPrefix}publishLocal $releaseTask

0 commit comments

Comments
 (0)