Skip to content

Commit 027fbbd

Browse files
committed
scharf
1 parent e3a0cae commit 027fbbd

File tree

2 files changed

+9
-15
lines changed

2 files changed

+9
-15
lines changed

admin/build.ps1

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ if ($env:APPVEYOR_FORCED_BUILD -eq 'true') {
2626
ensureVersion
2727
if ($env:mode -eq 'release') {
2828
echo "Running a release for $env:version"
29-
# setup s3 credentials
30-
# run sbt s3-upload
29+
$repositoriesFile="$env:APPVEYOR_BUILD_FOLDER\conf\repositories"
30+
& cmd /c "sbt ""-Dsbt.override.build.repos=true"" ""-Dsbt.repository.config=$repositoriesFile"" ""-Dproject.version=$env:version"" ""show fullResolvers"" clean update s3Upload" '2>&1'
31+
checkExit
3132
} else {
3233
echo "Unknown mode: '$env:mode'"
3334
Exit 1

admin/build.sh

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@ function setupSSH() {
5656
chmod 700 ~/.ssh && chmod 600 ~/.ssh/*
5757
}
5858

59-
function setupS3() {
60-
echo "setup s3"
61-
}
62-
6359
curlOut="curlOut.txt"
6460

6561
function checkStatus() {
@@ -105,22 +101,19 @@ if [[ "$TRAVIS_EVENT_TYPE" == "api" ]]; then
105101
if [[ "$mode" == "archives" ]]; then
106102
echo "Running 'archives' for $version"
107103
setupSSH
108-
ssh chara whoami
109-
# . scripts/jobs/release/website/archives
104+
. scripts/jobs/release/website/archives
110105
elif [[ "$mode" == "update-api" ]]; then
111106
echo "Running 'update-api' for $version"
112107
setupSSH
113-
ssh chara whoami
114-
# . scripts/jobs/release/website/update-api
108+
. scripts/jobs/release/website/update-api
115109
elif [[ "$mode" == "release" ]]; then
116110
echo "Running a release for $version"
117111
triggerMsiRelease
118-
setupS3
119112
repositoriesFile="$TRAVIS_BUILD_DIR/conf/repositories"
120-
# sbt \
121-
# -Dsbt.override.build.repos=true -Dsbt.repository.config="$repositoriesFile" \
122-
# -Dproject.version=$version \
123-
# clean update s3-upload
113+
sbt \
114+
-Dsbt.override.build.repos=true -Dsbt.repository.config="$repositoriesFile" \
115+
-Dproject.version=$version \
116+
"show fullResolvers" clean update s3Upload
124117
triggerSmoketest
125118
else
126119
echo "Unknown build mode: '$mode'"

0 commit comments

Comments
 (0)