Skip to content

0.3.0-RC2 #3066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 5, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 13 additions & 32 deletions .drone.yml
Original file line number Diff line number Diff line change
@@ -1,72 +1,53 @@
# After updating this file, you need to re-sign it:
#
# - Install [drone-cli](http://readme.drone.io/usage/getting-started-cli/)
# - Copy your token from http://dotty-ci.epfl.ch/account (Click SHOW TOKEN)
# - DRONE_TOKEN=your-token DRONE_SERVER=http://dotty-ci.epfl.ch drone sign lampepfl/dotty
#
# Please note that the signing can only be done by collaborators.

pipeline:
test:
image: lampepfl/dotty:07-06-2017
pull: true
commands:
- ./project/scripts/sbt "${CI_TEST}"
when:
branch:
exclude: gh-pages

publish_nightly:
image: lampepfl/dotty:07-06-2017
pull: true
environment:
- NIGHTLYBUILD=yes
commands:
- ./project/scripts/sbt ";clean ;publishLocal" "${CI_PUBLISH}"
- ./project/scripts/sbt "sbt-dotty/scripted source-dependencies/*" "${CI_PUBLISH}"
- NIGHTLYBUILD="yes" ./project/scripts/sbtPublish ${CI_PUBLISH} $SONATYPE_USER $SONATYPE_PW $PGP_PW ";dotty-bootstrapped/publishSigned ;sonatypeRelease"
- ./project/scripts/sbtPublish "${CI_PUBLISH}" "$SONATYPE_USER" "$SONATYPE_PW" "$PGP_PW" ";dotty-bootstrapped/publishSigned ;sonatypeRelease"
volumes:
- /home/drone/keys:/keys
secrets: [ sonatype_user, sonatype_pw, pgp_pw ]
when:
event: deployment
environment: nightly

publish_release:
image: lampepfl/dotty:07-06-2017
pull: true
environment:
- RELEASEBUILD=yes
commands:
- ./project/scripts/sbt ";clean ;publishLocal" "${CI_PUBLISH}"
- ./project/scripts/sbt "sbt-dotty/scripted source-dependencies/*" "${CI_PUBLISH}"
- RELEASEBUILD="yes" ./project/scripts/sbtPublish ${CI_PUBLISH} $SONATYPE_USER $SONATYPE_PW $PGP_PW ";dotty-bootstrapped/publishSigned ;sonatypeRelease"
- ./project/scripts/sbtPublish "${CI_PUBLISH}" "$SONATYPE_USER" "$SONATYPE_PW" "$PGP_PW" ";dotty-bootstrapped/publishSigned ;sonatypeRelease"
volumes:
- /home/drone/keys:/keys
secrets: [ sonatype_user, sonatype_pw, pgp_pw ]
when:
event: deployment
environment: release

publish_sbt_release:
image: lampepfl/dotty:07-06-2017
pull: true
environment:
- RELEASEBUILD=yes
commands:
- RELEASEBUILD="yes" ./project/scripts/sbtPublish ${CI_PUBLISH} $SONATYPE_USER $SONATYPE_PW $PGP_PW ";sbt-dotty/publishSigned ;sonatypeRelease"
- ./project/scripts/sbtPublish "${CI_PUBLISH}" "$SONATYPE_USER" "$SONATYPE_PW" "$PGP_PW" ";sbt-dotty/publishSigned ;sonatypeRelease"
volumes:
- /home/drone/keys:/keys
secrets: [ sonatype_user, sonatype_pw, pgp_pw ]
when:
event: deployment
environment: sbt_release

documentation:
image: lampepfl/dotty:07-06-2017
pull: true
commands:
- ./project/scripts/genDocs "${CI_PUBLISH}" $BOT_PASS
when:
branch: master

slack:
image: plugins/slack
channel: dotty
when:
branch: master
status: changed
branches: 0.3.x

matrix:
include:
Expand Down
1 change: 0 additions & 1 deletion .drone.yml.sig

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,6 @@ class ClassfileParser(
throw new IOException(s"class file '${in.file}' has wrong magic number 0x${toHexString(magic)}, should be 0x${toHexString(JAVA_MAGIC)}")
val minorVersion = in.nextChar.toInt
val majorVersion = in.nextChar.toInt
if (majorVersion >= JAVA8_MAJOR_VERSION)
Scala2UnpicklingMode |= Mode.Java8Unpickling
if ((majorVersion < JAVA_MAJOR_VERSION) ||
((majorVersion == JAVA_MAJOR_VERSION) &&
(minorVersion < JAVA_MINOR_VERSION)))
Expand Down
2 changes: 1 addition & 1 deletion project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ object Build {
val dottyOrganization = "ch.epfl.lamp"
val dottyGithubUrl = "https://github.com/lampepfl/dotty"
val dottyVersion = {
val baseVersion = "0.3.0-RC1"
val baseVersion = "0.3.0-RC2"
val isNightly = sys.env.get("NIGHTLYBUILD") == Some("yes")
val isRelease = sys.env.get("RELEASEBUILD") == Some("yes")
if (isNightly)
Expand Down