Address the comments in the review

scala · Jun 8, 2024 · 5f55261 · 5f55261
1 parent 84c6969
commit 5f55261
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/launchers.yml b/.github/workflows/launchers.yml
@@ -1,5 +1,6 @@
 name: Test CLI Launchers on all the platforms
 on:
+  pull_request:
   workflow_dispatch:
 
 jobs:

diff --git a/compiler/src/dotty/tools/MainGenericRunner.scala b/compiler/src/dotty/tools/MainGenericRunner.scala
@@ -270,7 +270,7 @@ object MainGenericRunner {
 
     val ranByCoursierBootstrap =
       sys.props.isDefinedAt("coursier.mainJar")
-      || sys.props.get("bootstrap.mainClass").filter(_ == "dotty.tools.MainGenericRunner").isDefined
+      || sys.props.get("bootstrap.mainClass").contains("dotty.tools.MainGenericRunner")
 
     val silenced = sys.props.get("scala.use_legacy_launcher") == Some("true")
 

diff --git a/project/Build.scala b/project/Build.scala
@@ -2323,8 +2323,7 @@ object Build {
       settings(scala3PresentationCompilerBuildInfo)
 
     def asDist(implicit mode: Mode): Project = project.
-      enablePlugins(PackPlugin).
-      enablePlugins(RepublishPlugin).
+      enablePlugins(PackPlugin, RepublishPlugin).
       withCommonSettings.
       settings(commonDistSettings).
       dependsOn(

diff --git a/project/Modes.scala b/project/Modes.scala
@@ -1,4 +1,4 @@
-import sbt.{Project, ProjectReference, SettingsDefinition, Plugins}
+import sbt.{Project, ProjectReference, SettingsDefinition}
 
 object Modes {
 

diff --git a/project/scripts/buildScalaBinary b/project/scripts/buildScalaBinary
@@ -2,7 +2,10 @@
 
 set -e
 
-source $(dirname $0)/cmdTestsCommon.inc.sh
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" >& /dev/null && pwd)/../.."
+
+# set the $DIST_PROJECT and $DIST_DIR variables
+source "$ROOT/bin/common-platform"
 
 # build the scala/scalac/scaladoc binary, where scala is native for the current platform.
 "$SBT" "$DIST_PROJECT/pack"