Skip to content

Commit 9ac9d3f

Browse files
committed
don't publish merglies
1 parent 1808f89 commit 9ac9d3f

File tree

2 files changed

+19
-8
lines changed

2 files changed

+19
-8
lines changed

admin/build.ps1

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,12 @@ if ($env:APPVEYOR_FORCED_BUILD -eq 'true') {
3434
ensureVersion
3535
clearIvyCache
3636
if ($env:mode -eq 'release') {
37-
echo "Running a release for $env:version"
38-
& cmd /c "sbt ""-Dproject.version=$env:version"" ""show fullResolvers"" clean update ghUpload" '2>&1'
37+
if ($env:version -match '-bin-' -or $env:version -match '-pre-') {
38+
& cmd /c "sbt ""-Dproject.version=$env:version"" clean update ""show s3Upload/mappings""" '2>&1'
39+
} else {
40+
echo "Running a release for $env:version"
41+
& cmd /c "sbt ""-Dproject.version=$env:version"" clean update ghUpload" '2>&1'
42+
}
3943
checkExit
4044
} else {
4145
echo "Unknown mode: '$env:mode'"

admin/build.sh

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,20 @@ if [[ "$TRAVIS_EVENT_TYPE" == "api" ]]; then
9090
setupSSH
9191
. scripts/jobs/release/website/update-api
9292
elif [[ "$mode" == "release" ]]; then
93-
echo "Running a release for $version"
9493
triggerMsiRelease
95-
# The log is too long for the travis UI, so remove ANSI codes to have a clean raw version
96-
sbt -Dsbt.log.noformat=true \
97-
-Dproject.version=$version \
98-
"show fullResolvers" clean update ghUpload
99-
triggerSmoketest
94+
if [[ "$version" =~ -bin- || "$version" =~ -pre- ]]; then
95+
# The log is too long for the travis UI, so remove ANSI codes to have a clean raw version
96+
sbt -Dsbt.log.noformat=true \
97+
-Dproject.version=$version \
98+
clean update "show s3Upload/mappings"
99+
else
100+
echo "Running a release for $version"
101+
# The log is too long for the travis UI, so remove ANSI codes to have a clean raw version
102+
sbt -Dsbt.log.noformat=true \
103+
-Dproject.version=$version \
104+
clean update ghUpload
105+
triggerSmoketest
106+
fi
100107
else
101108
echo "Unknown build mode: '$mode'"
102109
exit 1

0 commit comments

Comments
 (0)