Skip to content

Commit 851c3c2

Browse files
allanrenucciallanrenucci
authored
Revert "Simplify CI builds (#3084)" (#3092)
This reverts commit c53bcbc.
1 parent c53bcbc commit 851c3c2

File tree

4 files changed

+136
-135
lines changed

4 files changed

+136
-135
lines changed

‎.drone.yml‎

Lines changed: 32 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,17 @@
11
pipeline:
2-
# TESTS:
3-
# We run tests in parallel. Tests run in a copy of the working directory to avoid conflict
4-
test_legacy:
5-
group: test
6-
image: lampepfl/dotty:2017-09-08
7-
commands:
8-
- cp -R . /tmp/0/ && cd /tmp/0/
9-
- ./project/scripts/sbt legacyTests
10-
112
test:
12-
group: test
13-
image: lampepfl/dotty:2017-09-08
14-
commands:
15-
- cp -R . /tmp/1/ && cd /tmp/1/
16-
- ./project/scripts/sbt test
17-
18-
test_bootstrapped:
19-
group: test
20-
image: lampepfl/dotty:2017-09-08
21-
commands:
22-
- cp -R . /tmp/2/ && cd /tmp/2/
23-
- ./project/scripts/sbt dotty-bootstrapped/test
24-
25-
test_optimised:
26-
group: test
27-
image: lampepfl/dotty:2017-09-08
28-
commands:
29-
- cp -R . /tmp/3/ && cd /tmp/3/
30-
- ./project/scripts/sbt ";set bootstrapOptimised in ThisBuild := true ;dotty-bootstrapped/test"
31-
32-
test_sbt:
33-
group: test
34-
image: lampepfl/dotty:2017-09-08
35-
commands:
36-
- cp -R . /tmp/4/ && cd /tmp/4/
37-
- ./project/scripts/sbt sbt-dotty/scripted
38-
when:
39-
# sbt scripted tests are slow and don't run on PRs
40-
event: [ push, tag, deployment ]
41-
42-
# DOCUMENTATION:
43-
documentation:
44-
image: lampepfl/dotty:2017-09-08
3+
image: lampepfl/dotty:2017-09-05
454
commands:
46-
- ./project/scripts/genDocs
47-
secrets: [ bot_pass ]
48-
when:
49-
event: push
5+
- ./project/scripts/sbt "${CI_TEST}"
506

51-
# PUBLISHING:
52-
# Publishing expect NIGHTLYBUILD or RELEASEBUILD to be set. See dottyVersion in Build.scala
537
publish_nightly:
54-
image: lampepfl/dotty:2017-09-08
8+
image: lampepfl/dotty:2017-09-05
559
environment:
5610
- NIGHTLYBUILD=yes
5711
commands:
58-
- ./project/scripts/sbtPublish ";dotty-bootstrapped/publishSigned ;sonatypeRelease"
12+
- ./project/scripts/sbt ";clean ;publishLocal" "${CI_PUBLISH}"
13+
- ./project/scripts/sbt "sbt-dotty/scripted source-dependencies/*" "${CI_PUBLISH}"
14+
- ./project/scripts/sbtPublish "${CI_PUBLISH}" "$SONATYPE_USER" "$SONATYPE_PW" "$PGP_PW" ";dotty-bootstrapped/publishSigned ;sonatypeRelease"
5915
volumes:
6016
- /home/drone/keys:/keys
6117
secrets: [ sonatype_user, sonatype_pw, pgp_pw ]
@@ -64,11 +20,13 @@ pipeline:
6420
environment: nightly
6521

6622
publish_release:
67-
image: lampepfl/dotty:2017-09-08
23+
image: lampepfl/dotty:2017-09-05
6824
environment:
6925
- RELEASEBUILD=yes
7026
commands:
71-
- ./project/scripts/sbtPublish ";dotty-bootstrapped/publishSigned ;sonatypeRelease"
27+
- ./project/scripts/sbt ";clean ;publishLocal" "${CI_PUBLISH}"
28+
- ./project/scripts/sbt "sbt-dotty/scripted source-dependencies/*" "${CI_PUBLISH}"
29+
- ./project/scripts/sbtPublish "${CI_PUBLISH}" "$SONATYPE_USER" "$SONATYPE_PW" "$PGP_PW" ";dotty-bootstrapped/publishSigned ;sonatypeRelease"
7230
volumes:
7331
- /home/drone/keys:/keys
7432
secrets: [ sonatype_user, sonatype_pw, pgp_pw ]
@@ -77,26 +35,43 @@ pipeline:
7735
environment: release
7836

7937
publish_sbt_release:
80-
image: lampepfl/dotty:2017-09-08
38+
image: lampepfl/dotty:2017-09-05
8139
environment:
8240
- RELEASEBUILD=yes
8341
commands:
84-
- ./project/scripts/sbtPublish ";sbt-dotty/publishSigned ;sonatypeRelease"
42+
- ./project/scripts/sbtPublish "${CI_PUBLISH}" "$SONATYPE_USER" "$SONATYPE_PW" "$PGP_PW" ";sbt-dotty/publishSigned ;sonatypeRelease"
8543
volumes:
8644
- /home/drone/keys:/keys
8745
secrets: [ sonatype_user, sonatype_pw, pgp_pw ]
8846
when:
8947
event: deployment
9048
environment: sbt_release
9149

92-
# NOTIFICATIONS:
50+
documentation:
51+
image: lampepfl/dotty:2017-09-05
52+
commands:
53+
- ./project/scripts/genDocs "${CI_PUBLISH}" "$BOT_PASS"
54+
secrets: [ bot_pass ]
55+
when:
56+
event: push
57+
9358
slack:
9459
image: plugins/slack
9560
channel: dotty
9661
secrets: [ slack_webhook ]
9762
when:
9863
status: [ success, failure ]
99-
event: [ push, tag, deployment ]
64+
event: [ push, deployment ]
10065

101-
# CI runs only for the master branch (including PRs)
10266
branches: master
67+
68+
matrix:
69+
include:
70+
- CI_TEST: legacyTests
71+
CI_PUBLISH: true
72+
- CI_TEST: ;test;sbt-dotty/scripted compilerReporter/*;sbt-dotty/scripted discovery/*;sbt-dotty/scripted sbt-dotty/*
73+
CI_PUBLISH: false
74+
- CI_TEST: dotty-bootstrapped/test
75+
CI_PUBLISH: false
76+
- CI_TEST: ;set bootstrapOptimised in ThisBuild := true ;dotty-bootstrapped/test
77+
CI_PUBLISH: false

‎project/scripts/genDocs‎

Lines changed: 60 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,68 @@
11
#!/usr/bin/env bash
22

3-
# Usage:
4-
# BOT_PASS=<dotty-bot password> ./genDocs
3+
# Usage: ./genDocs <true/false> <dotty-bot password>
54

65
set -e
7-
86
# set extended glob, needed for rm everything but x
97
shopt -s extglob
108

11-
# make sure that BOT_PASS is set
12-
if [ -z "$BOT_PASS" ]; then
13-
echo "Error: BOT_PASS env unset, unable to push without password" 1>&2
14-
exit 1
9+
if [ $1 = true ]; then
10+
11+
# make sure that BOT_PASS is set
12+
if [ -z ${2+x} ]; then
13+
echo "BOT_PASS unset, unable to push without password" 1>&2
14+
exit 1
15+
else
16+
BOT_PASS=$2
17+
fi
18+
19+
echo "Working directory: $PWD"
20+
21+
# this command will generate docs in $PWD/docs/_site
22+
sbt -J-Xmx4096m \
23+
-J-XX:ReservedCodeCacheSize=512m \
24+
-J-XX:MaxMetaspaceSize=1024m \
25+
-Ddotty.drone.mem=4096m \
26+
-ivy /var/cache/drone/ivy2 \
27+
"genDocs"
28+
29+
# make sure that the previous command actually succeeded
30+
if [ ! -d "$PWD/docs/_site" ]; then
31+
echo "Output directory did not exist: $PWD/docs/_site" 1>&2
32+
exit 1
33+
fi
34+
35+
# save current head for commit message in gh-pages
36+
GIT_HEAD=$(git rev-parse HEAD)
37+
38+
# check out correct branch
39+
git fetch origin gh-pages:gh-pages
40+
git checkout gh-pages
41+
42+
# move newly generated _site dir to $PWD
43+
mv $PWD/docs/_site .
44+
45+
# remove everything BUT _site dir
46+
rm -rf !(_site)
47+
48+
# copy new contents to $PWD
49+
mv _site/* .
50+
51+
# remove now empty _site dir
52+
rm -rf _site
53+
54+
# set github credentials
55+
git config user.name "dotty-bot"
56+
git config user.email "felix.mulder@epfl.ch"
57+
58+
# add all contents of $PWD to commit
59+
git add -A
60+
git commit -m "Update gh-pages site for $GIT_HEAD" || echo "nothing new to commit"
61+
62+
# push using dotty-bot to origin
63+
git push https://dotty-bot:$BOT_PASS@github.com/lampepfl/dotty.git || echo "couldn't push, since nothing was added"
64+
else
65+
# wrong parameter passed, should only generate docs if argument is "test"
66+
# to avoid multiple site gens
67+
echo "Not generating docs for $1"
1568
fi
16-
17-
echo "Working directory: $PWD"
18-
19-
# this command will generate docs in $PWD/docs/_site
20-
SBT="$(cd "$(dirname "${BASH_SOURCE[0]}")" >& /dev/null && pwd)/sbt"
21-
eval "$SBT" "genDocs"
22-
23-
# make sure that the previous command actually succeeded
24-
if [ ! -d "$PWD/docs/_site" ]; then
25-
echo "Output directory did not exist: $PWD/docs/_site" 1>&2
26-
exit 1
27-
fi
28-
29-
# save current head for commit message in gh-pages
30-
GIT_HEAD=$(git rev-parse HEAD)
31-
32-
# check out correct branch
33-
git fetch origin gh-pages:gh-pages
34-
git checkout gh-pages
35-
36-
# move newly generated _site dir to $PWD
37-
mv $PWD/docs/_site .
38-
39-
# remove everything BUT _site dir
40-
rm -rf !(_site)
41-
42-
# copy new contents to $PWD
43-
mv _site/* .
44-
45-
# remove now empty _site dir
46-
rm -rf _site
47-
48-
# set github credentials
49-
git config user.name "dotty-bot"
50-
git config user.email "felix.mulder@epfl.ch"
51-
52-
# add all contents of $PWD to commit
53-
git add -A
54-
git commit -m "Update gh-pages site for $GIT_HEAD" || echo "nothing new to commit"
55-
56-
# push using dotty-bot to origin
57-
git push https://dotty-bot:$BOT_PASS@github.com/lampepfl/dotty.git || echo "couldn't push, since nothing was added"

‎project/scripts/sbt‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,26 @@
11
#!/usr/bin/env bash
22

3-
# Usage:
4-
# ./sbt <cmd>
3+
CI_TEST=$1
54

6-
CMD="$1"
7-
8-
if [ -z "$CMD" ]; then
9-
echo "Error: missing sbt command"
10-
exit 1
5+
if [ -n "$2" ]; then
6+
if [ $2 = true ]; then
7+
SHOULD_RUN=true
8+
else
9+
SHOULD_RUN=false
10+
fi
11+
else
12+
SHOULD_RUN=true
1113
fi
1214

13-
# run sbt with the supplied arg
14-
sbt -J-Xmx4096m \
15-
-J-XX:ReservedCodeCacheSize=512m \
16-
-J-XX:MaxMetaspaceSize=1024m \
17-
-Ddotty.drone.mem=4096m \
18-
-ivy /var/cache/drone/ivy2 \
19-
"$CMD"
15+
if [ $SHOULD_RUN = true ]; then
16+
# get the ivy2 cache:
17+
ln -s /var/cache/drone/ivy2 "$HOME/.ivy2" || true
18+
19+
# run sbt with the supplied arg:
20+
sbt -J-Xmx4096m \
21+
-J-XX:ReservedCodeCacheSize=512m \
22+
-J-XX:MaxMetaspaceSize=1024m \
23+
-Ddotty.drone.mem=4096m "$CI_TEST"
24+
else
25+
echo "Not running, \$2=$2, SHOULD_RUN=$SHOULD_RUN"
26+
fi

‎project/scripts/sbtPublish‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,32 @@
11
#!/usr/bin/env bash
22

3-
# Usage:
4-
# SONATYPE_USER=<sonatype user> SONATYPE_PW=<sonatype pw> PGP_PW=<pgp pw> ./sbtPublish <publish cmd>
3+
# If the script should publish to maven:
4+
SHOULD_RUN=$1
55

6-
set -e
6+
# Sonatype credentials:
7+
SONATYPE_USER=$2
8+
SONATYPE_PW=$3
9+
10+
# PGP Credentials:
11+
PGP_PW=$4
712

813
# Release command:
9-
RELEASE_CMD="$1"
14+
RELEASE_CMD=$5
1015

11-
if [ -z "$SONATYPE_USER" ] || [ -z "$SONATYPE_PW" ] || [ -z "$PGP_PW" ]; then
12-
echo "Error: SONATYPE_USER, SONATYPE_PW or PGP_PW env unset"
13-
exit 1
16+
if [ $SHOULD_RUN = false ]; then
17+
exit 0
1418
fi
1519

16-
if [ ! "$NIGHTLYBUILD" = "yes" ] && [ ! "$RELEASEBUILD" = "yes" ]; then
17-
echo "Neither NIGHTLYBUILD nor RELEASEBUILD env var set to \"yes\""
20+
if [ -z "$2" -o -z "$3" -o -z "$4" ]; then
21+
echo "invalid args: this script takes 4 args, usage:"
22+
echo ""
23+
echo " ./project/scripts/sbt SHOULD_RUN SONATYPE_USER SONATYPE_PW PGP_PW"
1824
exit 1
1925
fi
2026

21-
if [ -z "$RELEASE_CMD" ]; then
22-
echo "Error: missing publish command"
23-
exit 1
27+
if [ ! "$NIGHTLYBUILD" = "yes" ] && [ ! "$RELEASEBUILD" = "yes" ]; then
28+
echo "Neither NIGHTLYBUILD or RELEASEBUILD env var set to \"yes\""
29+
exit 1
2430
fi
2531

2632
CMD=" ;set credentials in ThisBuild := Seq(Credentials(\"Sonatype Nexus Repository Manager\", \"oss.sonatype.org\", \"$2\", \"$3\"))"
@@ -29,6 +35,8 @@ CMD="$CMD ;set pgpSecretRing := file(\"/keys/secring.asc\")"
2935
CMD="$CMD ;set pgpPublicRing := file(\"/keys/pubring.asc\")"
3036
CMD="$CMD $RELEASE_CMD"
3137

32-
# run sbt with the supplied arg
33-
SBT="$(cd "$(dirname "${BASH_SOURCE[0]}")" >& /dev/null && pwd)/sbt"
34-
eval "$SBT" "$CMD"
38+
sbt -J-Xmx4096m \
39+
-J-XX:ReservedCodeCacheSize=512m \
40+
-J-XX:MaxMetaspaceSize=1024m \
41+
-Ddotty.drone.mem=4096m \
42+
"$CMD"

0 commit comments

Comments
 (0)