From c260ea6debe6dff7beab5db5624816f411a97e5a Mon Sep 17 00:00:00 2001 From: Anatolii Date: Fri, 22 Nov 2019 16:26:46 +0100 Subject: [PATCH 1/4] CI debug --- .../communitybuild/CommunityBuildTest.scala | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala index 2881b6ef65f1..890352198617 100644 --- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala +++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala @@ -296,27 +296,27 @@ class CommunityBuildTest { } } - @Test def intent = projects.intent.run() + // @Test def intent = projects.intent.run() @Test def algebra = projects.algebra.run() @Test def scalacheck = projects.scalacheck.run() - @Test def scalatest = projects.scalatest.run() - @Test def scalaXml = projects.scalaXml.run() - @Test def scopt = projects.scopt.run() - @Test def scalap = projects.scalap.run() - @Test def squants = projects.squants.run() - @Test def betterfiles = projects.betterfiles.run() - @Test def ScalaPB = projects.ScalaPB.run() - @Test def minitest = projects.minitest.run() - @Test def fastparse = projects.fastparse.run() - @Test def utest = projects.utest.run() - @Test def sourcecode = projects.sourcecode.run() - @Test def oslib = projects.oslib.run() - @Test def oslibWatch = projects.oslibWatch.run() - @Test def stdLib213 = projects.stdLib213.run() - @Test def shapeless = projects.shapeless.run() - @Test def xmlInterpolator = projects.xmlInterpolator.run() - @Test def semanticdb = projects.semanticdb.run() - @Test def effpi = projects.effpi.run() + // @Test def scalatest = projects.scalatest.run() + // @Test def scalaXml = projects.scalaXml.run() + // @Test def scopt = projects.scopt.run() + // @Test def scalap = projects.scalap.run() + // @Test def squants = projects.squants.run() + // @Test def betterfiles = projects.betterfiles.run() + // @Test def ScalaPB = projects.ScalaPB.run() + // @Test def minitest = projects.minitest.run() + // @Test def fastparse = projects.fastparse.run() + // @Test def utest = projects.utest.run() + // @Test def sourcecode = projects.sourcecode.run() + // @Test def oslib = projects.oslib.run() + // @Test def oslibWatch = projects.oslibWatch.run() + // @Test def stdLib213 = projects.stdLib213.run() + // @Test def shapeless = projects.shapeless.run() + // @Test def xmlInterpolator = projects.xmlInterpolator.run() + // @Test def semanticdb = projects.semanticdb.run() + // @Test def effpi = projects.effpi.run() } class TestCategory From 08b155b4ec8ed6294cae05e39fc4163a9af81b94 Mon Sep 17 00:00:00 2001 From: Anatolii Date: Fri, 22 Nov 2019 16:40:43 +0100 Subject: [PATCH 2/4] Disable test and test-bootstrapped for a fast feedback loop --- .drone.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.drone.yml b/.drone.yml index 839cbb9a1aae..c44c12ecd11b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,23 +25,23 @@ steps: git pull "$DRONE_REMOTE_URL" "$DRONE_BRANCH"; fi -- name: test - pull: default - image: lampepfl/dotty:2019-10-17 - depends_on: [ clone ] - commands: - - cp -R . /tmp/1/ && cd /tmp/1/ - - ./project/scripts/sbt ";compile ;test" - - ./project/scripts/cmdTests - -- name: test_bootstrapped - pull: default - image: lampepfl/dotty:2019-10-17 - depends_on: [ clone ] - commands: - - cp -R . /tmp/2/ && cd /tmp/2/ - - ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test ;dotty-staging/test ;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test" - - ./project/scripts/bootstrapCmdTests +# - name: test +# pull: default +# image: lampepfl/dotty:2019-10-17 +# depends_on: [ clone ] +# commands: +# - cp -R . /tmp/1/ && cd /tmp/1/ +# - ./project/scripts/sbt ";compile ;test" +# - ./project/scripts/cmdTests + +# - name: test_bootstrapped +# pull: default +# image: lampepfl/dotty:2019-10-17 +# depends_on: [ clone ] +# commands: +# - cp -R . /tmp/2/ && cd /tmp/2/ +# - ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test ;dotty-staging/test ;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test" +# - ./project/scripts/bootstrapCmdTests - name: community_build pull: default From 5fad789bc972101c8fe57b218dd36502e53e0809 Mon Sep 17 00:00:00 2001 From: Anatolii Date: Fri, 22 Nov 2019 16:41:52 +0100 Subject: [PATCH 3/4] Enable other failing tests --- .../scala/dotty/communitybuild/CommunityBuildTest.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala index 890352198617..76b279cb790e 100644 --- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala +++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala @@ -297,14 +297,14 @@ class CommunityBuildTest { } // @Test def intent = projects.intent.run() - @Test def algebra = projects.algebra.run() + // @Test def algebra = projects.algebra.run() @Test def scalacheck = projects.scalacheck.run() // @Test def scalatest = projects.scalatest.run() // @Test def scalaXml = projects.scalaXml.run() // @Test def scopt = projects.scopt.run() // @Test def scalap = projects.scalap.run() // @Test def squants = projects.squants.run() - // @Test def betterfiles = projects.betterfiles.run() + @Test def betterfiles = projects.betterfiles.run() // @Test def ScalaPB = projects.ScalaPB.run() // @Test def minitest = projects.minitest.run() // @Test def fastparse = projects.fastparse.run() @@ -314,8 +314,8 @@ class CommunityBuildTest { // @Test def oslibWatch = projects.oslibWatch.run() // @Test def stdLib213 = projects.stdLib213.run() // @Test def shapeless = projects.shapeless.run() - // @Test def xmlInterpolator = projects.xmlInterpolator.run() - // @Test def semanticdb = projects.semanticdb.run() + @Test def xmlInterpolator = projects.xmlInterpolator.run() + @Test def semanticdb = projects.semanticdb.run() // @Test def effpi = projects.effpi.run() } From ceee63ec0773a4d8a06f8778dd7f553f95614531 Mon Sep 17 00:00:00 2001 From: Anatolii Date: Fri, 22 Nov 2019 16:43:10 +0100 Subject: [PATCH 4/4] Disable irrelevant CI tests --- .drone.yml | 312 ++++++++++++++++++++++++++--------------------------- 1 file changed, 156 insertions(+), 156 deletions(-) diff --git a/.drone.yml b/.drone.yml index c44c12ecd11b..2f80b739154f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -53,161 +53,161 @@ steps: - git submodule update --init --recursive --jobs 7 - ./project/scripts/sbt community-build/test -- name: test_sbt - pull: default - image: lampepfl/dotty:2019-10-17 - depends_on: [ clone ] - commands: - - cp -R . /tmp/4/ && cd /tmp/4/ - - ./project/scripts/sbt sbt-dotty/scripted - when: - event: - - tag - - promote - -- name: test_java11 - pull: default - image: lampepfl/dotty:2019-10-17 - depends_on: [ clone ] - commands: - - export PATH="/usr/lib/jvm/java-11-openjdk-amd64/bin:$PATH" - - cp -R . /tmp/6/ && cd /tmp/6/ - - ./project/scripts/sbt ";compile ;test" - when: - event: - - tag - - promote - -- name: documentation - pull: default - image: lampepfl/dotty:2019-10-17 - depends_on: - - test - - test_bootstrapped - - community_build - - test_java11 - commands: - - ./project/scripts/genDocs - environment: - BOT_TOKEN: - from_secret: bot_token - when: - branch: - - master - event: - - push - -- name: publish_nightly - pull: default - image: lampepfl/dotty:2019-10-17 - depends_on: - - test - - test_bootstrapped - - community_build - - test_sbt - - test_java11 - commands: - - ./project/scripts/sbtPublish ";project dotty-bootstrapped ;publishSigned ;sonatypeBundleRelease" - environment: - NIGHTLYBUILD: yes - PGP_PW: - from_secret: pgp_pw - PGP_SECRET: - from_secret: pgp_secret - SONATYPE_PW: - from_secret: sonatype_pw - SONATYPE_USER: - from_secret: sonatype_user - when: - event: - - promote - target: - - nightly - -- name: publish_release - pull: default - image: lampepfl/dotty:2019-10-17 - depends_on: - - test - - test_bootstrapped - - community_build - - test_sbt - - test_java11 - commands: - - ./project/scripts/sbt dist-bootstrapped/packArchive - - ./project/scripts/sbtPublish ";project dotty-bootstrapped ;publishSigned ;sonatypeBundleRelease" - environment: - PGP_PW: - from_secret: pgp_pw - PGP_SECRET: - from_secret: pgp_secret - RELEASEBUILD: yes - SONATYPE_PW: - from_secret: sonatype_pw - SONATYPE_USER: - from_secret: sonatype_user - when: - event: - - tag - -- name: github_release - pull: default - image: plugins/github-release - depends_on: [ publish_release ] - settings: - checksum: - - sha256 - draft: true - files: - - dist-bootstrapped/target/dotty-* - environment: - GITHUB_TOKEN: - from_secret: github_token - when: - event: - - tag - -- name: publish_sbt_release - pull: default - image: lampepfl/dotty:2019-10-17 - depends_on: - - test - - test_bootstrapped - - community_build - - test_sbt - - test_java11 - commands: - - ./project/scripts/sbtPublish ";project sbt-dotty ;publishSigned ;sonatypeBundleRelease" - environment: - PGP_PW: - from_secret: pgp_pw - PGP_SECRET: - from_secret: pgp_secret - RELEASEBUILD: yes - SONATYPE_PW: - from_secret: sonatype_pw - SONATYPE_USER: - from_secret: sonatype_user - when: - event: - - promote - target: - - sbt_release - -- name: slack - pull: default - image: plugins/slack - settings: - channel: dotty - environment: - SLACK_WEBHOOK: - from_secret: slack_webhook - when: - event: - - push - - tag - - promote - status: - - failure +# - name: test_sbt +# pull: default +# image: lampepfl/dotty:2019-10-17 +# depends_on: [ clone ] +# commands: +# - cp -R . /tmp/4/ && cd /tmp/4/ +# - ./project/scripts/sbt sbt-dotty/scripted +# when: +# event: +# - tag +# - promote + +# - name: test_java11 +# pull: default +# image: lampepfl/dotty:2019-10-17 +# depends_on: [ clone ] +# commands: +# - export PATH="/usr/lib/jvm/java-11-openjdk-amd64/bin:$PATH" +# - cp -R . /tmp/6/ && cd /tmp/6/ +# - ./project/scripts/sbt ";compile ;test" +# when: +# event: +# - tag +# - promote + +# - name: documentation +# pull: default +# image: lampepfl/dotty:2019-10-17 +# depends_on: +# - test +# - test_bootstrapped +# - community_build +# - test_java11 +# commands: +# - ./project/scripts/genDocs +# environment: +# BOT_TOKEN: +# from_secret: bot_token +# when: +# branch: +# - master +# event: +# - push + +# - name: publish_nightly +# pull: default +# image: lampepfl/dotty:2019-10-17 +# depends_on: +# - test +# - test_bootstrapped +# - community_build +# - test_sbt +# - test_java11 +# commands: +# - ./project/scripts/sbtPublish ";project dotty-bootstrapped ;publishSigned ;sonatypeBundleRelease" +# environment: +# NIGHTLYBUILD: yes +# PGP_PW: +# from_secret: pgp_pw +# PGP_SECRET: +# from_secret: pgp_secret +# SONATYPE_PW: +# from_secret: sonatype_pw +# SONATYPE_USER: +# from_secret: sonatype_user +# when: +# event: +# - promote +# target: +# - nightly + +# - name: publish_release +# pull: default +# image: lampepfl/dotty:2019-10-17 +# depends_on: +# - test +# - test_bootstrapped +# - community_build +# - test_sbt +# - test_java11 +# commands: +# - ./project/scripts/sbt dist-bootstrapped/packArchive +# - ./project/scripts/sbtPublish ";project dotty-bootstrapped ;publishSigned ;sonatypeBundleRelease" +# environment: +# PGP_PW: +# from_secret: pgp_pw +# PGP_SECRET: +# from_secret: pgp_secret +# RELEASEBUILD: yes +# SONATYPE_PW: +# from_secret: sonatype_pw +# SONATYPE_USER: +# from_secret: sonatype_user +# when: +# event: +# - tag + +# - name: github_release +# pull: default +# image: plugins/github-release +# depends_on: [ publish_release ] +# settings: +# checksum: +# - sha256 +# draft: true +# files: +# - dist-bootstrapped/target/dotty-* +# environment: +# GITHUB_TOKEN: +# from_secret: github_token +# when: +# event: +# - tag + +# - name: publish_sbt_release +# pull: default +# image: lampepfl/dotty:2019-10-17 +# depends_on: +# - test +# - test_bootstrapped +# - community_build +# - test_sbt +# - test_java11 +# commands: +# - ./project/scripts/sbtPublish ";project sbt-dotty ;publishSigned ;sonatypeBundleRelease" +# environment: +# PGP_PW: +# from_secret: pgp_pw +# PGP_SECRET: +# from_secret: pgp_secret +# RELEASEBUILD: yes +# SONATYPE_PW: +# from_secret: sonatype_pw +# SONATYPE_USER: +# from_secret: sonatype_user +# when: +# event: +# - promote +# target: +# - sbt_release + +# - name: slack +# pull: default +# image: plugins/slack +# settings: +# channel: dotty +# environment: +# SLACK_WEBHOOK: +# from_secret: slack_webhook +# when: +# event: +# - push +# - tag +# - promote +# status: +# - failure ...