Skip to content

Commit cc4533d

Browse files
authored
Merge pull request #2411 from dotty-staging/topic/ordered-nightly
Order nightly before docs generation
2 parents 81d0178 + ba58cc1 commit cc4533d

File tree

3 files changed

+26
-24
lines changed

3 files changed

+26
-24
lines changed

.drone.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,6 @@ pipeline:
1717
branch:
1818
exclude: gh-pages
1919

20-
documentation:
21-
image: lampepfl/dotty:24-04-2017
22-
pull: true
23-
commands:
24-
- ./project/scripts/genDocs "${CI_PUBLISH}" $BOT_PASS
25-
when:
26-
branch: master
27-
2820
publish_nightly:
2921
image: lampepfl/dotty:24-04-2017
3022
pull: true
@@ -33,13 +25,21 @@ pipeline:
3325
- ./project/scripts/sbt "sbt-scripted-tests/scripted source-dependencies/*1of3" "${CI_PUBLISH}"
3426
- ./project/scripts/sbt "sbt-scripted-tests/scripted source-dependencies/*2of3" "${CI_PUBLISH}"
3527
- ./project/scripts/sbt "sbt-scripted-tests/scripted source-dependencies/*3of3" "${CI_PUBLISH}"
36-
- ./project/scripts/sbtPublish "${CI_PUBLISH}" $SONATYPE_USER $SONATYPE_PW $PGP_PW
28+
- ./project/scripts/sbtPublish '${CI_PUBLISH}' '$SONATYPE_USER' '$SONATYPE_PW' '$PGP_PW'
3729
volumes:
3830
- /home/drone/keys:/keys
3931
when:
4032
event: deployment
4133
environment: nightly
4234

35+
documentation:
36+
image: lampepfl/dotty:24-04-2017
37+
pull: true
38+
commands:
39+
- ./project/scripts/genDocs "${CI_PUBLISH}" $BOT_PASS
40+
when:
41+
branch: master
42+
4343
slack:
4444
image: plugins/slack
4545
channel: dotty

.drone.yml.sig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
eyJhbGciOiJIUzI1NiJ9.IyBBZnRlciB1cGRhdGluZyB0aGlzIGZpbGUsIHlvdSBuZWVkIHRvIHJlLXNpZ24gaXQ6CiMKIyAtIEluc3RhbGwgW2Ryb25lLWNsaV0oaHR0cDovL3JlYWRtZS5kcm9uZS5pby91c2FnZS9nZXR0aW5nLXN0YXJ0ZWQtY2xpLykKIyAtIENvcHkgeW91ciB0b2tlbiBmcm9tICBodHRwOi8vZG90dHktY2kuZXBmbC5jaC9hY2NvdW50IChDbGljayBTSE9XIFRPS0VOKQojIC0gKGV4cG9ydCBEUk9ORV9UT0tFTj15b3VyLXRva2VuOyBleHBvcnQgRFJPTkVfU0VSVkVSPWh0dHA6Ly9kb3R0eS1jaS5lcGZsLmNoOyBkcm9uZSBzaWduIGxhbXBlcGZsL2RvdHR5KQojCiMgUGxlYXNlIG5vdGUgdGhhdCB0aGUgc2lnbmluZyBjYW4gb25seSBiZSBkb25lIGJ5IGNvbGxhYm9yYXRvcnMuCgpwaXBlbGluZToKICB0ZXN0OgogICAgaW1hZ2U6IGxhbXBlcGZsL2RvdHR5OjI0LTA0LTIwMTcKICAgIHB1bGw6IHRydWUKICAgIGNvbW1hbmRzOgogICAgICAtIGxuIC1zIC92YXIvY2FjaGUvZHJvbmUvaXZ5MiAiJEhPTUUvLml2eTIiCiAgICAgIC0gLi9wcm9qZWN0L3NjcmlwdHMvc2J0ICIke0NJX1RFU1R9IgogICAgd2hlbjoKICAgICAgYnJhbmNoOgogICAgICAgIGV4Y2x1ZGU6IGdoLXBhZ2VzCgogIGRvY3VtZW50YXRpb246CiAgICBpbWFnZTogbGFtcGVwZmwvZG90dHk6MjQtMDQtMjAxNwogICAgcHVsbDogdHJ1ZQogICAgY29tbWFuZHM6CiAgICAgIC0gLi9wcm9qZWN0L3NjcmlwdHMvZ2VuRG9jcyAiJHtDSV9QVUJMSVNIfSIgJEJPVF9QQVNTCiAgICB3aGVuOgogICAgICBicmFuY2g6IG1hc3RlcgoKICBwdWJsaXNoX25pZ2h0bHk6CiAgICBpbWFnZTogbGFtcGVwZmwvZG90dHk6MjQtMDQtMjAxNwogICAgcHVsbDogdHJ1ZQogICAgY29tbWFuZHM6CiAgICAgIC0gLi9wcm9qZWN0L3NjcmlwdHMvc2J0ICI7Y2xlYW4gO3B1Ymxpc2hMb2NhbCIgIiR7Q0lfUFVCTElTSH0iCiAgICAgIC0gLi9wcm9qZWN0L3NjcmlwdHMvc2J0ICJzYnQtc2NyaXB0ZWQtdGVzdHMvc2NyaXB0ZWQgc291cmNlLWRlcGVuZGVuY2llcy8qMW9mMyIgIiR7Q0lfUFVCTElTSH0iCiAgICAgIC0gLi9wcm9qZWN0L3NjcmlwdHMvc2J0ICJzYnQtc2NyaXB0ZWQtdGVzdHMvc2NyaXB0ZWQgc291cmNlLWRlcGVuZGVuY2llcy8qMm9mMyIgIiR7Q0lfUFVCTElTSH0iCiAgICAgIC0gLi9wcm9qZWN0L3NjcmlwdHMvc2J0ICJzYnQtc2NyaXB0ZWQtdGVzdHMvc2NyaXB0ZWQgc291cmNlLWRlcGVuZGVuY2llcy8qM29mMyIgIiR7Q0lfUFVCTElTSH0iCiAgICAgIC0gLi9wcm9qZWN0L3NjcmlwdHMvc2J0UHVibGlzaCAiJHtDSV9QVUJMSVNIfSIgJFNPTkFUWVBFX1VTRVIgJFNPTkFUWVBFX1BXICRQR1BfUFcKICAgIHZvbHVtZXM6CiAgICAgIC0gL2hvbWUvZHJvbmUva2V5czova2V5cwogICAgd2hlbjoKICAgICAgZXZlbnQ6IGRlcGxveW1lbnQKICAgICAgZW52aXJvbm1lbnQ6IG5pZ2h0bHkKCiAgc2xhY2s6CiAgICBpbWFnZTogcGx1Z2lucy9zbGFjawogICAgY2hhbm5lbDogZG90dHkKICAgIHdoZW46CiAgICAgIGJyYW5jaDogbWFzdGVyCiAgICAgIHN0YXR1czogY2hhbmdlZAoKbWF0cml4OgogIGluY2x1ZGU6CiAgICAtIENJX1RFU1Q6IGRvdHR5LWJpbi10ZXN0cy90ZXN0CiAgICAgIENJX1BVQkxJU0g6IHRydWUKICAgIC0gQ0lfVEVTVDogbGVnYWN5VGVzdHMKICAgICAgQ0lfUFVCTElTSDogZmFsc2UKICAgIC0gQ0lfVEVTVDogO3Rlc3Q7c2J0LWRvdHR5L3NjcmlwdGVkCiAgICAgIENJX1BVQkxJU0g6IGZhbHNlCiAgICAtIENJX1RFU1Q6IGRvdHR5LWJvb3RzdHJhcHBlZC90ZXN0CiAgICAgIENJX1BVQkxJU0g6IGZhbHNlCg.O_biEvwGlnIIhT1aKFsJ5JKmsKdzJS1du2ZdSfajw6I
1+
eyJhbGciOiJIUzI1NiJ9.IyBBZnRlciB1cGRhdGluZyB0aGlzIGZpbGUsIHlvdSBuZWVkIHRvIHJlLXNpZ24gaXQ6CiMKIyAtIEluc3RhbGwgW2Ryb25lLWNsaV0oaHR0cDovL3JlYWRtZS5kcm9uZS5pby91c2FnZS9nZXR0aW5nLXN0YXJ0ZWQtY2xpLykKIyAtIENvcHkgeW91ciB0b2tlbiBmcm9tICBodHRwOi8vZG90dHktY2kuZXBmbC5jaC9hY2NvdW50IChDbGljayBTSE9XIFRPS0VOKQojIC0gKGV4cG9ydCBEUk9ORV9UT0tFTj15b3VyLXRva2VuOyBleHBvcnQgRFJPTkVfU0VSVkVSPWh0dHA6Ly9kb3R0eS1jaS5lcGZsLmNoOyBkcm9uZSBzaWduIGxhbXBlcGZsL2RvdHR5KQojCiMgUGxlYXNlIG5vdGUgdGhhdCB0aGUgc2lnbmluZyBjYW4gb25seSBiZSBkb25lIGJ5IGNvbGxhYm9yYXRvcnMuCgpwaXBlbGluZToKICB0ZXN0OgogICAgaW1hZ2U6IGxhbXBlcGZsL2RvdHR5OjI0LTA0LTIwMTcKICAgIHB1bGw6IHRydWUKICAgIGNvbW1hbmRzOgogICAgICAtIGxuIC1zIC92YXIvY2FjaGUvZHJvbmUvaXZ5MiAiJEhPTUUvLml2eTIiCiAgICAgIC0gLi9wcm9qZWN0L3NjcmlwdHMvc2J0ICIke0NJX1RFU1R9IgogICAgd2hlbjoKICAgICAgYnJhbmNoOgogICAgICAgIGV4Y2x1ZGU6IGdoLXBhZ2VzCgogIHB1Ymxpc2hfbmlnaHRseToKICAgIGltYWdlOiBsYW1wZXBmbC9kb3R0eToyNC0wNC0yMDE3CiAgICBwdWxsOiB0cnVlCiAgICBjb21tYW5kczoKICAgICAgLSAuL3Byb2plY3Qvc2NyaXB0cy9zYnQgIjtjbGVhbiA7cHVibGlzaExvY2FsIiAiJHtDSV9QVUJMSVNIfSIKICAgICAgLSAuL3Byb2plY3Qvc2NyaXB0cy9zYnQgInNidC1zY3JpcHRlZC10ZXN0cy9zY3JpcHRlZCBzb3VyY2UtZGVwZW5kZW5jaWVzLyoxb2YzIiAiJHtDSV9QVUJMSVNIfSIKICAgICAgLSAuL3Byb2plY3Qvc2NyaXB0cy9zYnQgInNidC1zY3JpcHRlZC10ZXN0cy9zY3JpcHRlZCBzb3VyY2UtZGVwZW5kZW5jaWVzLyoyb2YzIiAiJHtDSV9QVUJMSVNIfSIKICAgICAgLSAuL3Byb2plY3Qvc2NyaXB0cy9zYnQgInNidC1zY3JpcHRlZC10ZXN0cy9zY3JpcHRlZCBzb3VyY2UtZGVwZW5kZW5jaWVzLyozb2YzIiAiJHtDSV9QVUJMSVNIfSIKICAgICAgLSAuL3Byb2plY3Qvc2NyaXB0cy9zYnRQdWJsaXNoICcke0NJX1BVQkxJU0h9JyAnJFNPTkFUWVBFX1VTRVInICckU09OQVRZUEVfUFcnICckUEdQX1BXJwogICAgdm9sdW1lczoKICAgICAgLSAvaG9tZS9kcm9uZS9rZXlzOi9rZXlzCiAgICB3aGVuOgogICAgICBldmVudDogZGVwbG95bWVudAogICAgICBlbnZpcm9ubWVudDogbmlnaHRseQoKICBkb2N1bWVudGF0aW9uOgogICAgaW1hZ2U6IGxhbXBlcGZsL2RvdHR5OjI0LTA0LTIwMTcKICAgIHB1bGw6IHRydWUKICAgIGNvbW1hbmRzOgogICAgICAtIC4vcHJvamVjdC9zY3JpcHRzL2dlbkRvY3MgIiR7Q0lfUFVCTElTSH0iICRCT1RfUEFTUwogICAgd2hlbjoKICAgICAgYnJhbmNoOiBtYXN0ZXIKCiAgc2xhY2s6CiAgICBpbWFnZTogcGx1Z2lucy9zbGFjawogICAgY2hhbm5lbDogZG90dHkKICAgIHdoZW46CiAgICAgIGJyYW5jaDogbWFzdGVyCiAgICAgIHN0YXR1czogY2hhbmdlZAoKbWF0cml4OgogIGluY2x1ZGU6CiAgICAtIENJX1RFU1Q6IGRvdHR5LWJpbi10ZXN0cy90ZXN0CiAgICAgIENJX1BVQkxJU0g6IHRydWUKICAgIC0gQ0lfVEVTVDogbGVnYWN5VGVzdHMKICAgICAgQ0lfUFVCTElTSDogZmFsc2UKICAgIC0gQ0lfVEVTVDogO3Rlc3Q7c2J0LWRvdHR5L3NjcmlwdGVkCiAgICAgIENJX1BVQkxJU0g6IGZhbHNlCiAgICAtIENJX1RFU1Q6IGRvdHR5LWJvb3RzdHJhcHBlZC90ZXN0CiAgICAgIENJX1BVQkxJU0g6IGZhbHNlCg.HnCjsaRZZqENfAxCbozo2UWxzPIFXuhMrO7-YDzplZg

project/scripts/sbtPublish

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,27 @@ SONATYPE_PW=$3
1010
# PGP Credentials:
1111
PGP_PW=$4
1212

13-
if [ -z "$SONATYPE_USER" -o -z "$SONATYPE_PW" -o -z "$PGP_PRIV_KEY" -o -z "$PGP_PW" ]; then
13+
if [ $SHOULD_RUN = false ]; then
14+
exit 0
15+
fi
16+
17+
if [ -z "$SONATYPE_USER" -o -z "$SONATYPE_PW" -o -z "$PGP_PW" ]; then
1418
echo "invalid args: this script takes 4 args, usage:"
1519
echo ""
1620
echo " ./project/scripts/sbt SHOULD_RUN SONATYPE_USER SONATYPE_PW PGP_PW"
1721
exit 1
1822
fi
1923

20-
if [ $SHOULD_RUN = true ]; then
21-
CMD=' ;set credentials += Credentials("Sonatype Nexus Repository Manager", "oss.sonatype.org", "'"$SONATYPE_USER"'", "'"$SONATYPE_PW"'")'
22-
CMD="$CMD ;set pgpPassphrase := Some(\"$PGP_PW\".toCharArray)"
23-
CMD="$CMD ;set pgpSecretRing := file(\"/keys/secring.asc\")"
24-
CMD="$CMD ;set pgpPublicRing := file(\"/keys/pubring.asc\")"
25-
CMD="$CMD ;dotty-bootstrapped/publishSigned ;sonatypeRelease"
24+
CMD=' ;set credentials += Credentials("Sonatype Nexus Repository Manager", "oss.sonatype.org", "'"$SONATYPE_USER"'", "'"$SONATYPE_PW"'")'
25+
CMD="$CMD ;set pgpPassphrase := Some(\"$PGP_PW\".toCharArray)"
26+
CMD="$CMD ;set pgpSecretRing := file(\"/keys/secring.asc\")"
27+
CMD="$CMD ;set pgpPublicRing := file(\"/keys/pubring.asc\")"
28+
CMD="$CMD ;dotty-bootstrapped/publishSigned ;sonatypeRelease"
2629

27-
echo "Will run sbt with command: \"$CMD\""
30+
echo "Will run sbt with command: \"$CMD\""
2831

29-
sbt -J-Xmx4096m \
30-
-J-XX:ReservedCodeCacheSize=512m \
31-
-J-XX:MaxMetaspaceSize=1024m \
32-
-Ddotty.drone.mem=4096m \
33-
"$CMD"
34-
fi
32+
sbt -J-Xmx4096m \
33+
-J-XX:ReservedCodeCacheSize=512m \
34+
-J-XX:MaxMetaspaceSize=1024m \
35+
-Ddotty.drone.mem=4096m \
36+
"$CMD"

0 commit comments

Comments
 (0)