Skip to content

Commit 998bae0

Browse files
committed
Correctly ignore non-sbt projects
1 parent 3b4bf6a commit 998bae0

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

project-builder/build-revision.sh

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,14 +179,24 @@ function buildForScalaVersion(){
179179
if [ -f "repo/mill" ] || [ -f "repo/build.mill" ] || [ -f "repo/build.mill.scala" ] || [ -f "repo/build.sc" ]; then
180180
echo "Mill project found: ${isMillProject}"
181181
echo "mill" > $buildToolFile
182-
$scriptDir/mill/prepare-project.sh "$project" "$repoDir" "$scalaVersion" "$projectConfig"
183-
createBuildPatch
184-
$scriptDir/mill/build.sh "$repoDir" "$scalaVersion" "$targets" "$mvnRepoUrl" "$projectConfig" "$extraScalacOptions" "$disabledScalacOptions"
185-
revertBuildPatch
182+
echo "success" > build-status.txt
183+
echo "Ignoring mill build"
184+
186185
## Sbt
187186
## Apparently built.sbt is a valid build file name. Accept any .sbt file
187+
elif ls repo/*.sbt 1> /dev/null 2>&1 ; then
188+
echo "sbt project found: ${isSbtProject}"
189+
echo "sbt" > $buildToolFile
190+
$scriptDir/sbt/prepare-project.sh "$project" "$repoDir" "$scalaVersion" "$projectConfig"
191+
createBuildPatch
192+
$scriptDir/sbt/build.sh "$repoDir" "$scalaVersion" "$targets" "$mvnRepoUrl" "$projectConfig" "$extraScalacOptions" "$disabledScalacOptions" "$extraLibraryDeps"
193+
revertBuildPatch
194+
## Scala-cli
188195
else
189-
echo "Ignoring non sbt build"
196+
echo "Not found sbt or mill build files, assuming scala-cli project"
197+
ls -l repo/
198+
echo "Ignoring scala-cli build"
199+
echo "scala-cli" > $buildToolFile
190200
echo "success" > build-status.txt
191201
fi
192202

0 commit comments

Comments
 (0)