Skip to content
This repository has been archived by the owner on Jun 24, 2021. It is now read-only.

Commit

Permalink
Run "gradle all test" instead of "gradle build" for CI.
Browse files Browse the repository at this point in the history
Fixes #85
  • Loading branch information
brcolow committed Jun 4, 2018
1 parent 99f62c7 commit 973642f
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
5 changes: 2 additions & 3 deletions .ci/before_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@ set -euo pipefail

if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
openjdk='openjdk-10.0.1_osx-x64_bin.tar.gz'
wget https://download.java.net/java/GA/jdk10/10.0.1/fb4372174a714e6b8c52526dc134031e/10/$openjdk
wget -nv https://download.java.net/java/GA/jdk10/10.0.1/fb4372174a714e6b8c52526dc134031e/10/$openjdk
mkdir -p ~/jdk10
tar -zxf "$openjdk" -C ~/jdk10 --strip-components 4 # Strip Contents/Home/
ls -la ~/jdk10
brew update
brew install ant
brew install findutils
# brew tap AdoptOpenJDK/openjdk
# brew install adoptopenjdk-openjdk10
brew unlink python # fixes 'run_one_line' is not defined error in backtrace
fi

Expand Down
2 changes: 1 addition & 1 deletion .ci/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ fi
echo "which java: $(which java)"
ulimit -c unlimited -S

sh ./gradlew build -PCONF=DebugNative -x :web:test --no-daemon --stacktrace --info
sh ./gradlew all test -PCONF=DebugNative -x :web:test --no-daemon --stacktrace --info

# Print core dumps when JVM crashes.
RESULT=$?
Expand Down
10 changes: 7 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,17 @@ shallow_clone: true

build_script:
- ps: |
# choco install jdk10 --force --cache 'C:\ProgramData\chocolatey\cache' -params 'installdir=c:\\jdk10'
choco install ant
$client = New-Object net.webclient
$client.DownloadFile('http://downloads.sourceforge.net/gnuwin32/zip-3.0-bin.zip', 'C:\Users\appveyor\zip-3.0.zip')
Expand-Archive -Path 'C:\Users\appveyor\zip-3.0.zip' -DestinationPath 'C:\Users\appveyor\zip'
$client.DownloadFile('http://downloads.sourceforge.net/gnuwin32/zip-3.0-dep.zip', 'C:\Users\appveyor\zip-3.0-deps.zip')
Expand-Archive -Path 'C:\Users\appveyor\zip-3.0-deps.zip' -DestinationPath 'C:\Users\appveyor\zip'
$env:PATH = "C:\Users\appveyor\zip\bin;$env:PATH"
$openJdk10 = 'https://github.com/AdoptOpenJDK/openjdk10-nightly/releases/download/jdk-10%2B23-20180524/OpenJDK10_x64_Win_20180524.zip'
$client.DownloadFile($openJdk10, 'C:\Users\appveyor\openjdk10.zip')
Expand-Archive -Path 'C:\Users\appveyor\openjdk10.zip' -DestinationPath 'C:\Users\appveyor\openjdk10'
Copy-Item -Path 'C:\Users\appveyor\openjdk10\*\' -Destination 'C:\jdk10' -Recurse -Force
# Start-Process 'C:\Users\appveyor\jdk-10.exe' -ArgumentList "/s ADDLOCAL=`"ToolsFeature,SourceFeature,PublicjreFeature`" /INSTALLDIR=`"C:\jdk10`" /L `"C:\Users\appveyor\jdk-10-install.txt`"" -Wait
choco install gradle --version 4.3.0
$msvcToolsVer = Get-Content "$env:VCINSTALLDIR\Microsoft.VCToolsVersion.default.txt"
if ([string]::IsNullOrWhitespace($msvcToolsVer)) {
Expand All @@ -29,7 +33,7 @@ build_script:
$env:VSVARS32FILE = "$env:VCINSTALLDIR\vcvars32.bat"
refreshenv
# Must invoke gradle with cmd.exe so stderr output doesn't fail the build:
- cmd: gradlew build -PCOMPILE_WEBKIT=false -PCONF=DebugNative --stacktrace -x :web:test --info --no-daemon
- cmd: gradlew all test -PCOMPILE_WEBKIT=false -PCONF=DebugNative --stacktrace -x :web:test --info --no-daemon

on_finish:
- ps: |
Expand Down

0 comments on commit 973642f

Please sign in to comment.