Skip to content

Commit c17be7d

Browse files
committed
Test the 0.6.x branch of Scala.js as well as master.
1 parent eceb2ac commit c17be7d

File tree

2 files changed

+29
-10
lines changed

2 files changed

+29
-10
lines changed

.travis.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,19 @@ before_install:
44
- nvm install 12.13.0
55
script:
66
- node -v
7-
- ./run.sh $SCALA_BRANCH
7+
- ./run.sh $SCALA_BRANCH $SCALAJS_BRANCH
88
scala:
99
# This is actually overridden by the run.sh script
1010
- 2.13.1
1111
jdk:
1212
- openjdk8
1313
env:
14-
- SCALA_BRANCH=2.11.x
15-
- SCALA_BRANCH=2.12.x
16-
- SCALA_BRANCH=2.13.x
14+
- SCALA_BRANCH=2.11.x SCALAJS_BRANCH=master
15+
- SCALA_BRANCH=2.12.x SCALAJS_BRANCH=master
16+
- SCALA_BRANCH=2.13.x SCALAJS_BRANCH=master
17+
- SCALA_BRANCH=2.11.x SCALAJS_BRANCH=0.6.x
18+
- SCALA_BRANCH=2.12.x SCALAJS_BRANCH=0.6.x
19+
- SCALA_BRANCH=2.13.x SCALAJS_BRANCH=0.6.x
1720

1821
cache:
1922
directories:

run.sh

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,31 @@
1-
BRANCH="$1"
1+
SCALA_BRANCH="$1"
2+
SCALAJS_BRANCH="$2"
23

3-
SCALA_VERSION=$(wget -q -O - https://raw.githubusercontent.com/scala/community-builds/$BRANCH/nightly.properties | grep '^nightly=' | cut -d '=' -f2)
4-
SUFFIX=$(echo $BRANCH | tr '.' '_' | cut -d '_' -f1-2)
4+
SCALA_VERSION=$(wget -q -O - https://raw.githubusercontent.com/scala/community-builds/$SCALA_BRANCH/nightly.properties | grep '^nightly=' | cut -d '=' -f2)
5+
SUFFIX=$(echo $SCALA_BRANCH | tr '.' '_' | cut -d '_' -f1-2)
56

6-
echo "Branch: $BRANCH"
7+
echo "Scala branch: $SCALA_BRANCH"
78
echo "Scala version: $SCALA_VERSION"
89
echo "Project suffix: $SUFFIX"
10+
echo "Scala.js branch: $SCALAJS_BRANCH"
11+
12+
case $SCALAJS_BRANCH in
13+
0.6.x)
14+
TESTS="testSuite/test testSuiteJVM/test ir/test irJS/test"
15+
;;
16+
master)
17+
TESTS="testSuite$SUFFIX/test testSuiteJVM$SUFFIX/test ir$SUFFIX/test irJS$SUFFIX/test linker$SUFFIX/test linkerJS$SUFFIX/test"
18+
;;
19+
*)
20+
echo "Unknown Scala.js branch $SCALAJS_BRANCH"
21+
exit 1
22+
esac
23+
24+
echo "Tests:" $TESTS
925

1026
rm -rf scala-js/ && \
1127
git clone https://github.com/scala-js/scala-js.git && \
1228
cd scala-js && \
13-
git checkout master && \
29+
git checkout $SCALAJS_BRANCH && \
1430
npm install && \
15-
sbt 'set resolvers in Global += "scala-integration" at "https://scala-ci.typesafe.com/artifactory/scala-integration/"' ++$SCALA_VERSION testSuite$SUFFIX/test testSuiteJVM$SUFFIX/test ir$SUFFIX/test irJS$SUFFIX/test linker$SUFFIX/test linkerJS$SUFFIX/test
31+
sbt 'set resolvers in Global += "scala-integration" at "https://scala-ci.typesafe.com/artifactory/scala-integration/"' ++$SCALA_VERSION $TESTS

0 commit comments

Comments
 (0)