Skip to content

Commit aeafc08

Browse files
committed
Address the comments in the review
1 parent 84c6969 commit aeafc08

File tree

5 files changed

+9
-5
lines changed

5 files changed

+9
-5
lines changed

Diff for: .github/workflows/launchers.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
name: Test CLI Launchers on all the platforms
22
on:
3+
pull_request:
34
workflow_dispatch:
45

56
jobs:

Diff for: compiler/src/dotty/tools/MainGenericRunner.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ object MainGenericRunner {
270270

271271
val ranByCoursierBootstrap =
272272
sys.props.isDefinedAt("coursier.mainJar")
273-
|| sys.props.get("bootstrap.mainClass").filter(_ == "dotty.tools.MainGenericRunner").isDefined
273+
|| sys.props.get("bootstrap.mainClass").contains("dotty.tools.MainGenericRunner")
274274

275275
val silenced = sys.props.get("scala.use_legacy_launcher") == Some("true")
276276

Diff for: project/Build.scala

+1-2
Original file line numberDiff line numberDiff line change
@@ -2323,8 +2323,7 @@ object Build {
23232323
settings(scala3PresentationCompilerBuildInfo)
23242324

23252325
def asDist(implicit mode: Mode): Project = project.
2326-
enablePlugins(PackPlugin).
2327-
enablePlugins(RepublishPlugin).
2326+
enablePlugins(PackPlugin, RepublishPlugin).
23282327
withCommonSettings.
23292328
settings(commonDistSettings).
23302329
dependsOn(

Diff for: project/Modes.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import sbt.{Project, ProjectReference, SettingsDefinition, Plugins}
1+
import sbt.{Project, ProjectReference, SettingsDefinition}
22

33
object Modes {
44

Diff for: project/scripts/buildScalaBinary

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22

33
set -e
44

5-
source $(dirname $0)/cmdTestsCommon.inc.sh
5+
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" >& /dev/null && pwd)/../.."
6+
SBT="$ROOT/project/scripts/sbt" # if run on CI
7+
8+
# set the $DIST_PROJECT and $DIST_DIR variables
9+
source "$ROOT/bin/common-platform"
610

711
# build the scala/scalac/scaladoc binary, where scala is native for the current platform.
812
"$SBT" "$DIST_PROJECT/pack"

0 commit comments

Comments
 (0)