From 5f55261cecd4da39b3059ee6b744ae36c9debe68 Mon Sep 17 00:00:00 2001
From: Hamza REMMAL <hamza@remmal.dev>
Date: Sat, 8 Jun 2024 12:07:23 +0100
Subject: [PATCH] Address the comments in the review

---
 .github/workflows/launchers.yml                  | 1 +
 compiler/src/dotty/tools/MainGenericRunner.scala | 2 +-
 project/Build.scala                              | 3 +--
 project/Modes.scala                              | 2 +-
 project/scripts/buildScalaBinary                 | 5 ++++-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/launchers.yml b/.github/workflows/launchers.yml
index 719ac20b9828..818e3b72b06b 100644
--- 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
index 5b238693a135..bf477f019cba 100644
--- 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
index 0786c47ad5fc..c1a8800421a6 100644
--- 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
index 8f34aa5870e4..eddb5a3f1a7b 100644
--- 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
index 552831c07b41..087a9b25b60b 100755
--- 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"