Skip to content

Commit b945c96

Browse files
committed
Fix CI: make dotty-staging available in dotc and dotd
1 parent 2c529c6 commit b945c96

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

dist/bin/dotc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ classpathArgs () {
6161
toolchain+="$SBT_INTF$PSEP"
6262
toolchain+="$DOTTY_INTF$PSEP"
6363
toolchain+="$DOTTY_COMP$PSEP"
64+
toolchain+="$DOTTY_STAGING$PSEP"
6465

6566
# jine
6667
toolchain+="$JLINE_READER$PSEP"

dist/bin/dotd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ ST4_LIB=$(find_lib "*ST4*")
7676
# Set jsoup dep:
7777
JSOUP_LIB=$(find_lib "*jsoup*")
7878

79-
CLASS_PATH="$DOTTY_LIB$PSEP$DOTTY_COMP$PSEP$DOTTY_DOC_LIB$PSEP$DOTTY_INTF$PSEP$SBT_INTF"
79+
CLASS_PATH="$DOTTY_LIB$PSEP$DOTTY_COMP$PSEP$DOTTY_DOC_LIB$PSEP$DOTTY_INTF$PSEP$SBT_INTF$PSEP$DOTTY_STAGING"
8080
CLASS_PATH="$CLASS_PATH$PSEP$SCALA_LIB"
8181
CLASS_PATH="$CLASS_PATH$PSEP$FLEXMARK_LIBS"
8282
CLASS_PATH="$CLASS_PATH$PSEP$JACKSON_LIBS"

project/scripts/bootstrapCmdTests

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ test "$EXPECTED_OUTPUT" = "$(cat "$tmp")"
2727
clear_out "$OUT"
2828
./bin/dotc tests/run-staging/i4044f.scala -d "$OUT"
2929
./bin/dotr -classpath "$OUT" Test > "$tmp"
30+
./bin/dotd -project Staging -siteroot "$OUT" "tests/run-staging/i4044f.scala"
3031

3132
# check that `dotc -from-tasty` compiles and `dotr` runs it
3233
echo "testing ./bin/dotc -from-tasty and dotr -classpath"

0 commit comments

Comments
 (0)