From a645cc6466c2c024cb53090f4cc6f648b8f1a195 Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Tue, 2 Jan 2024 22:00:19 +0100 Subject: [PATCH] Try fix CI failures --- cli/scb-cli.scala | 5 +++++ project-builder/mill/build.sh | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cli/scb-cli.scala b/cli/scb-cli.scala index a1b884ab..f13edaef 100755 --- a/cli/scb-cli.scala +++ b/cli/scb-cli.scala @@ -1260,6 +1260,11 @@ class LocalReproducer(using config: Config, build: BuildInfo): projectDir, replaceExisting = true ) + os.copy.into( + millBuilder / "compat" / "0.11.sc", + projectDir / "MillVersionCompat.sc", + replaceExisting = true + ) val sharedSourcesDir = projectBuilderDir / "shared" os.list(sharedSourcesDir) .foreach { path => diff --git a/project-builder/mill/build.sh b/project-builder/mill/build.sh index 63721cba..d4a4e1b4 100755 --- a/project-builder/mill/build.sh +++ b/project-builder/mill/build.sh @@ -52,8 +52,7 @@ function tryBuild() { $mill ${millSettings[@]} runCommunityBuild "$scalaVersion" "${projectConfig}" "${targets[@]}" } -rm ../build-summary.txt && touch ../build-summary.txt -cat ../build-summary.txt + # Retry only if previous build failed to start export MILL_VERSION=$millVersion tryBuild mill || ([[ -f ./mill && ! -s ../build-summary.txt ]] && tryBuild ./mill)