Skip to content

Commit 37fab22

Browse files
smartersmarter
committed
Bump reference compiler to the previous commit
And the revert the CI changes from the previous commit which are no longer needed.
1 parent 6960f8d commit 37fab22

File tree

2 files changed

+153
-154
lines changed

2 files changed

+153
-154
lines changed

‎.drone.yml‎

Lines changed: 152 additions & 153 deletions
Original file line numberDiff line numberDiff line change
@@ -34,79 +34,78 @@ steps:
3434
- ./project/scripts/sbt ";compile ;test"
3535
- ./project/scripts/cmdTests
3636

37-
# - name: test_bootstrapped
38-
# pull: default
39-
# image: lampepfl/dotty:2019-08-22
40-
# depends_on: [ clone ]
41-
# commands:
42-
# - cp -R . /tmp/2/ && cd /tmp/2/
43-
# - ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test ;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test"
44-
# - ./project/scripts/bootstrapCmdTests
45-
46-
# - name: community_build
47-
# pull: default
48-
# image: lampepfl/dotty:2019-08-22
49-
# depends_on: [ clone ]
50-
# commands:
51-
# - cp -R . /tmp/3/ && cd /tmp/3/
52-
# - git submodule update --init --recursive --jobs 7
53-
# - ./project/scripts/sbt community-build/test
54-
55-
# - name: test_sbt
56-
# pull: default
57-
# image: lampepfl/dotty:2019-08-22
58-
# depends_on: [ clone ]
59-
# commands:
60-
# - cp -R . /tmp/4/ && cd /tmp/4/
61-
# - ./project/scripts/sbt sbt-dotty/scripted
62-
# when:
63-
# event:
64-
# - tag
65-
# - promote
66-
67-
# - name: test_java11
68-
# pull: default
69-
# image: lampepfl/dotty:2019-08-22
70-
# depends_on: [ clone ]
71-
# commands:
72-
# - export PATH="/usr/lib/jvm/java-11-openjdk-amd64/bin:$PATH"
73-
# - cp -R . /tmp/6/ && cd /tmp/6/
74-
# - ./project/scripts/sbt ";compile ;test"
75-
# when:
76-
# event:
77-
# - push
78-
# - tag
79-
# - promote
80-
81-
# - name: documentation
82-
# pull: default
83-
# image: lampepfl/dotty:2019-08-22
84-
# depends_on:
85-
# - test
86-
# - test_bootstrapped
87-
# - community_build
88-
# - test_java11
89-
# commands:
90-
# - ./project/scripts/genDocs
91-
# environment:
92-
# BOT_TOKEN:
93-
# from_secret: bot_token
94-
# when:
95-
# branch:
96-
# - master
97-
# event:
98-
# - push
37+
- name: test_bootstrapped
38+
pull: default
39+
image: lampepfl/dotty:2019-08-22
40+
depends_on: [ clone ]
41+
commands:
42+
- cp -R . /tmp/2/ && cd /tmp/2/
43+
- ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test ;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test"
44+
- ./project/scripts/bootstrapCmdTests
45+
46+
- name: community_build
47+
pull: default
48+
image: lampepfl/dotty:2019-08-22
49+
depends_on: [ clone ]
50+
commands:
51+
- cp -R . /tmp/3/ && cd /tmp/3/
52+
- git submodule update --init --recursive --jobs 7
53+
- ./project/scripts/sbt community-build/test
54+
55+
- name: test_sbt
56+
pull: default
57+
image: lampepfl/dotty:2019-08-22
58+
depends_on: [ clone ]
59+
commands:
60+
- cp -R . /tmp/4/ && cd /tmp/4/
61+
- ./project/scripts/sbt sbt-dotty/scripted
62+
when:
63+
event:
64+
- tag
65+
- promote
66+
67+
- name: test_java11
68+
pull: default
69+
image: lampepfl/dotty:2019-08-22
70+
depends_on: [ clone ]
71+
commands:
72+
- export PATH="/usr/lib/jvm/java-11-openjdk-amd64/bin:$PATH"
73+
- cp -R . /tmp/6/ && cd /tmp/6/
74+
- ./project/scripts/sbt ";compile ;test"
75+
when:
76+
event:
77+
- push
78+
- tag
79+
- promote
80+
81+
- name: documentation
82+
pull: default
83+
image: lampepfl/dotty:2019-08-22
84+
depends_on:
85+
- test
86+
- test_bootstrapped
87+
- community_build
88+
- test_java11
89+
commands:
90+
- ./project/scripts/genDocs
91+
environment:
92+
BOT_TOKEN:
93+
from_secret: bot_token
94+
when:
95+
branch:
96+
- master
97+
event:
98+
- push
9999

100100
- name: publish_nightly
101101
pull: default
102102
image: lampepfl/dotty:2019-08-22
103103
depends_on:
104-
- clone
105-
# - test
106-
# - test_bootstrapped
107-
# - community_build
108-
# - test_sbt
109-
# - test_java11
104+
- test
105+
- test_bootstrapped
106+
- community_build
107+
- test_sbt
108+
- test_java11
110109
commands:
111110
- ./project/scripts/sbtPublish ";dotty-bootstrapped/publishSigned ;sonatypeRelease"
112111
environment:
@@ -125,90 +124,90 @@ steps:
125124
target:
126125
- nightly
127126

128-
# - name: publish_release
129-
# pull: default
130-
# image: lampepfl/dotty:2019-08-22
131-
# depends_on:
132-
# - test
133-
# - test_bootstrapped
134-
# - community_build
135-
# - test_sbt
136-
# - test_java11
137-
# commands:
138-
# - ./project/scripts/sbt dist-bootstrapped/packArchive
139-
# - ./project/scripts/sbtPublish ";dotty-bootstrapped/publishSigned ;sonatypeRelease"
140-
# environment:
141-
# PGP_PW:
142-
# from_secret: pgp_pw
143-
# PGP_SECRET:
144-
# from_secret: pgp_secret
145-
# RELEASEBUILD: yes
146-
# SONATYPE_PW:
147-
# from_secret: sonatype_pw
148-
# SONATYPE_USER:
149-
# from_secret: sonatype_user
150-
# when:
151-
# event:
152-
# - tag
153-
154-
# - name: github_release
155-
# pull: default
156-
# image: plugins/github-release
157-
# depends_on: [ publish_release ]
158-
# settings:
159-
# checksum:
160-
# - sha256
161-
# draft: true
162-
# files:
163-
# - dist-bootstrapped/target/dotty-*
164-
# environment:
165-
# GITHUB_TOKEN:
166-
# from_secret: github_token
167-
# when:
168-
# event:
169-
# - tag
170-
171-
# - name: publish_sbt_release
172-
# pull: default
173-
# image: lampepfl/dotty:2019-08-22
174-
# depends_on:
175-
# - test
176-
# - test_bootstrapped
177-
# - community_build
178-
# - test_sbt
179-
# - test_java11
180-
# commands:
181-
# - ./project/scripts/sbtPublish ";sbt-dotty/publishSigned ;sonatypeRelease"
182-
# environment:
183-
# PGP_PW:
184-
# from_secret: pgp_pw
185-
# PGP_SECRET:
186-
# from_secret: pgp_secret
187-
# RELEASEBUILD: yes
188-
# SONATYPE_PW:
189-
# from_secret: sonatype_pw
190-
# SONATYPE_USER:
191-
# from_secret: sonatype_user
192-
# when:
193-
# event:
194-
# - promote
195-
# target:
196-
# - sbt_release
197-
198-
# - name: slack
199-
# pull: default
200-
# image: plugins/slack
201-
# settings:
202-
# channel: dotty
203-
# environment:
204-
# SLACK_WEBHOOK:
205-
# from_secret: slack_webhook
206-
# when:
207-
# event:
208-
# - push
209-
# - tag
210-
# - promote
211-
# status:
212-
# - failure
127+
- name: publish_release
128+
pull: default
129+
image: lampepfl/dotty:2019-08-22
130+
depends_on:
131+
- test
132+
- test_bootstrapped
133+
- community_build
134+
- test_sbt
135+
- test_java11
136+
commands:
137+
- ./project/scripts/sbt dist-bootstrapped/packArchive
138+
- ./project/scripts/sbtPublish ";dotty-bootstrapped/publishSigned ;sonatypeRelease"
139+
environment:
140+
PGP_PW:
141+
from_secret: pgp_pw
142+
PGP_SECRET:
143+
from_secret: pgp_secret
144+
RELEASEBUILD: yes
145+
SONATYPE_PW:
146+
from_secret: sonatype_pw
147+
SONATYPE_USER:
148+
from_secret: sonatype_user
149+
when:
150+
event:
151+
- tag
152+
153+
- name: github_release
154+
pull: default
155+
image: plugins/github-release
156+
depends_on: [ publish_release ]
157+
settings:
158+
checksum:
159+
- sha256
160+
draft: true
161+
files:
162+
- dist-bootstrapped/target/dotty-*
163+
environment:
164+
GITHUB_TOKEN:
165+
from_secret: github_token
166+
when:
167+
event:
168+
- tag
169+
170+
- name: publish_sbt_release
171+
pull: default
172+
image: lampepfl/dotty:2019-08-22
173+
depends_on:
174+
- test
175+
- test_bootstrapped
176+
- community_build
177+
- test_sbt
178+
- test_java11
179+
commands:
180+
- ./project/scripts/sbtPublish ";sbt-dotty/publishSigned ;sonatypeRelease"
181+
environment:
182+
PGP_PW:
183+
from_secret: pgp_pw
184+
PGP_SECRET:
185+
from_secret: pgp_secret
186+
RELEASEBUILD: yes
187+
SONATYPE_PW:
188+
from_secret: sonatype_pw
189+
SONATYPE_USER:
190+
from_secret: sonatype_user
191+
when:
192+
event:
193+
- promote
194+
target:
195+
- sbt_release
196+
197+
- name: slack
198+
pull: default
199+
image: plugins/slack
200+
settings:
201+
channel: dotty
202+
environment:
203+
SLACK_WEBHOOK:
204+
from_secret: slack_webhook
205+
when:
206+
event:
207+
- push
208+
- tag
209+
- promote
210+
status:
211+
- failure
213212

214213
...

‎project/Build.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ object MyScalaJSPlugin extends AutoPlugin {
5858
}
5959

6060
object Build {
61-
val referenceVersion = "0.18.1-bin-20190823-8c856e9-NIGHTLY"
61+
val referenceVersion = "0.18.1-bin-20190825-6960f8d-NIGHTLY"
6262

6363
val baseVersion = "0.18.1"
6464
val baseSbtDottyVersion = "0.3.4"

0 commit comments

Comments
 (0)