From d9cdfdbc9dd548c2a77a18bf7b01214f611be2fc Mon Sep 17 00:00:00 2001 From: Allan Renucci Date: Wed, 29 Nov 2017 10:59:26 +0100 Subject: [PATCH 1/3] Release Dotty 0.5.0-RC1 --- project/Build.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Build.scala b/project/Build.scala index e7d8b28830dc..6c9dafea1279 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -38,7 +38,7 @@ object ExposedValues extends AutoPlugin { object Build { - val baseVersion = "0.5.0" + val baseVersion = "0.5.0-RC1" val scalacVersion = "2.12.4" val dottyOrganization = "ch.epfl.lamp" From db4b8ed8bbdb3c4229b0dc4a6515ef84d3b69b42 Mon Sep 17 00:00:00 2001 From: Fengyun Liu Date: Thu, 30 Nov 2017 10:55:23 +0100 Subject: [PATCH 2/3] Fix dotr for Cygwin and MingW (#3599) --- dist/bin/dotr | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/bin/dotr b/dist/bin/dotr index 7b14f243e1b3..bb3d06330fdb 100755 --- a/dist/bin/dotr +++ b/dist/bin/dotr @@ -58,16 +58,16 @@ done if [ $run_repl == true ] || [ ${#residual_args[@]} -eq 0 ]; then if [ "$CLASS_PATH" ]; then - cp_arg="-classpath $CLASS_PATH" + cp_arg="-classpath \"$CLASS_PATH\"" fi echo "Starting dotty REPL..." - eval "$PROG_HOME/bin/dotc $cp_arg -repl ${residual_args[@]}" + eval "\"$PROG_HOME/bin/dotc\" $cp_arg -repl ${residual_args[@]}" else - cp_arg="-classpath $DOTTY_LIB$PSEP$SCALA_LIB" + cp_arg="$DOTTY_LIB$PSEP$SCALA_LIB" if [ -z "$CLASS_PATH" ]; then cp_arg+="$PSEP." else cp_arg+="$PSEP$CLASS_PATH" fi - eval exec "\"$JAVACMD\"" "$DEBUG" "$cp_arg" "${residual_args[@]}" + eval exec "\"$JAVACMD\"" "$DEBUG" "-classpath \"$cp_arg\"" "${residual_args[@]}" fi From fee72f09bf5c4fe9e27130848d47fe1c08615a3b Mon Sep 17 00:00:00 2001 From: Allan Renucci Date: Thu, 18 Jan 2018 13:28:25 +0100 Subject: [PATCH 3/3] Fix issue with clone script --- project/scripts/ci-clone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/scripts/ci-clone b/project/scripts/ci-clone index 9e789fa056df..d707c1985da0 100755 --- a/project/scripts/ci-clone +++ b/project/scripts/ci-clone @@ -5,7 +5,7 @@ set -eux if [ "$DRONE_BUILD_EVENT" = "pull_request" ]; then git config user.email "allan.renucci@gmail.com" git config user.name "Allan Renucci" - git pull --rebase "$DRONE_REMOTE_URL" "$DRONE_BRANCH" + git pull "$DRONE_REMOTE_URL" "$DRONE_BRANCH" fi # clone submodules in parallel