mirror of
https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git
synced 2024-12-22 16:14:10 -08:00
Fix node.js version in travis. Fix htmlUnit profile in maven
This commit is contained in:
parent
790f4e9eee
commit
c7f0749671
10
.travis.yml
10
.travis.yml
|
@ -1,6 +1,7 @@
|
|||
language: java
|
||||
jdk:
|
||||
- oraclejdk8
|
||||
|
||||
cache:
|
||||
directories:
|
||||
- $HOME/.m2
|
||||
|
@ -11,15 +12,18 @@ branches:
|
|||
- master
|
||||
- /^release-.+$/
|
||||
- /^dev-.+/
|
||||
|
||||
before_install:
|
||||
- nvm install 7
|
||||
- CHROMIUM_BUILD=466537
|
||||
- mkdir -p $HOME/.chromium_dist/
|
||||
- wget -nc https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2F$CHROMIUM_BUILD%2Fchrome-linux.zip?alt=media -O $HOME/.chromium_dist/chromium-$CHROMIUM_BUILD.zip
|
||||
- unzip $HOME/.chromium_dist/chromium-$CHROMIUM_BUILD.zip
|
||||
- unzip -q $HOME/.chromium_dist/chromium-$CHROMIUM_BUILD.zip
|
||||
- OLD_VERSION=`mvn help:evaluate -Dexpression=project.version 2>/dev/null | grep -Ev "(^\[|Download\w+:)"`
|
||||
- NEW_VERSION=${OLD_VERSION%-SNAPSHOT}-dev-`printf %d $TRAVIS_BUILD_NUMBER`
|
||||
- echo "Building version $NEW_VERSION"
|
||||
- mvn versions:set -DnewVersion=$NEW_VERSION
|
||||
|
||||
install:
|
||||
- mvn install -Dteavm.build.all=false -P with-idea -DskipTests=true -Dmaven.javadoc.skip=true -B -V
|
||||
- pushd tests/src/test/js
|
||||
|
@ -27,8 +31,9 @@ install:
|
|||
- npm install
|
||||
- npm run build
|
||||
- popd
|
||||
|
||||
script:
|
||||
- mvn -e test -P noHtmlUnit
|
||||
- mvn -e test -P \!htmlUnit
|
||||
- BASE_PATH=`pwd`
|
||||
- pushd tests/src/test/js
|
||||
- chrome-linux/chrome --headless --remote-debugging-port=9222 --disable-gpu about:blank &
|
||||
|
@ -37,6 +42,7 @@ script:
|
|||
- node start.js $BASE_PATH/html4j/target/js-tests
|
||||
- kill $CHROME_PID
|
||||
- popd
|
||||
|
||||
after_success: >
|
||||
if [[ "${TRAVIS_PULL_REQUEST:-unknown}" == "false" && $TRAVIS_BRANCH == dev-* ]] ; then
|
||||
export NEW_VERSION
|
||||
|
|
|
@ -88,23 +88,20 @@
|
|||
<configLocation>../checkstyle.xml</configLocation>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<version>2.16</version>
|
||||
<configuration>
|
||||
<systemProperties>
|
||||
<teavm.junit.target>${project.build.directory}/js-tests</teavm.junit.target>
|
||||
<teavm.junit.minified>true</teavm.junit.minified>
|
||||
<teavm.junit.optimized>true</teavm.junit.optimized>
|
||||
</systemProperties>
|
||||
<argLine>-Xmx512m</argLine>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
<pluginManagement>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<version>2.16</version>
|
||||
<configuration>
|
||||
<systemProperties>
|
||||
<teavm.junit.target>${project.build.directory}/js-tests</teavm.junit.target>
|
||||
<teavm.junit.minified>true</teavm.junit.minified>
|
||||
<teavm.junit.optimized>true</teavm.junit.optimized>
|
||||
</systemProperties>
|
||||
<argLine>-Xmx512m</argLine>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</pluginManagement>
|
||||
</build>
|
||||
</project>
|
||||
|
|
5
pom.xml
5
pom.xml
|
@ -288,7 +288,7 @@
|
|||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>noHtmlUnit</id>
|
||||
<id>htmlUnit</id>
|
||||
<activation>
|
||||
<activeByDefault>true</activeByDefault>
|
||||
</activation>
|
||||
|
@ -302,10 +302,7 @@
|
|||
<version>2.16</version>
|
||||
<configuration>
|
||||
<systemProperties>
|
||||
<teavm.junit.target>${project.build.directory}/js-tests</teavm.junit.target>
|
||||
<teavm.junit.js.runner>htmlunit</teavm.junit.js.runner>
|
||||
<teavm.junit.minified>true</teavm.junit.minified>
|
||||
<teavm.junit.optimized>true</teavm.junit.optimized>
|
||||
</systemProperties>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
|
Loading…
Reference in New Issue
Block a user