From 7ebd74c5d32d745090c4bc3572677f04477afa9f Mon Sep 17 00:00:00 2001 From: Stefan Marr Date: Mon, 12 Mar 2018 16:27:48 +0000 Subject: [PATCH 1/6] Setup AppVeyor Signed-off-by: Stefan Marr --- .appveyor.yml | 29 +++++++++++++++++++ .travis.yml | 78 --------------------------------------------------- 2 files changed, 29 insertions(+), 78 deletions(-) create mode 100644 .appveyor.yml delete mode 100644 .travis.yml diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 000000000..5e18765d7 --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,29 @@ +version: build {build} {branch} + +image: Visual Studio 2017 + +install: + - ps: | + Add-Type -AssemblyName System.IO.Compression.FileSystem + if (!(Test-Path -Path "C:\ant\apache-ant-1.10.2" )) { + (new-object System.Net.WebClient).DownloadFile( + 'http://www.mirrorservice.org/sites/ftp.apache.org//ant/binaries/apache-ant-1.10.2-bin.zip', + 'C:\ant-bin.zip' + ) + [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\ant-bin.zip", "C:\ant") + } + - cmd: SET JAVA_HOME=C:\Program Files\Java\jdk9 + - cmd: SET PATH=C:\ant\apache-ant-1.10.2\bin;%JAVA_HOME%\bin;%PATH% + - cmd: echo %USERPROFILE% + - cmd: echo %PATH% + - cmd: java -version + - cmd: git submodule update --init --recursive + +build_script: + - ant compile + +test_script: + - som core-lib/TestSuite/TestRunner.ns + +cache: + - C:\ant diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 445fe4a2a..000000000 --- a/.travis.yml +++ /dev/null @@ -1,78 +0,0 @@ -language: java -jdk: - - oraclejdk8 -dist: trusty -sudo: false -env: - global: - - secure: PrFbSr/qjhVXrpiOzrcEMUZrnjEWJmvx5DC9QdaAmnUKpG9/7mJBQVgNziVj+GWfW84WJpkOsQf+I2lx7/cQsWQKad/t8wtypl30wGesSTpAgl5fCiKLOBAbOghKXir+WIaxtcATPPffur9OLh3ogEcmIQbVi682YUKmA5zF11JZdpCR4QONc/u+DqB29FuHru/cFiesYP0Oz82A+M0UtMcYsurKIxdKMD4YK/uSG892PUrcZU6STXlukhgQuy3PitSWkYV2KGxXMVKzWGM7dJvRggN05r/S871pscuRwZ+Doxqr9b17B3umCHi3i4KXmNH+Esb0p1mvegs0iS/b7RyA5SENre+H24n3SOeXTa3wSpTnF90XxQrDEBbY5wV7lN7MJG+pHxkOvoZt6pS3f7x2VYR8Joa4J+Gf6IDvxZMiCd1v3N1kc9ygyvJmHf5wDmLMdupk0/frojApDXfJT6bqiVL3S0FqZpXSPGAsKYf8wfn30Xz/YUBsnfUQ/a21Zz52+OTqPbt32Hf1FGYIEJSkZJUN90Q8rHVJt9zPg37xKCDuf6bxlvT040KSzuuXtizLkOnHq2rhg4Oad/JTw3d4NzPoRVzUI9qDKPrA7RdUAjmrB04Z1f3g/I6w3h2B9JTSFAzBcMZ5NYZhIqE31GQukgStaqC98y32/zo9xFs= - - secure: "WalAXxkaD+B+mMBN+1QXrsQVl90984+giSLl7dgPwTPdQ/Ka/8AlX4n53HATztgmjwgJbM+Y53YhoSR6Zaj8CRUL6WhXGwNA2q7Xma8q0WNmX8LmoBsJlw44G50yGQOv20vTRw4SqPJp58f4PQanAAs4iPuNBOMGYji4eg60pC1bV5ZNyB5HalxQQQR5PyV647Ooa4WmP3YYLlx4FWqhh33kM3pt9RUOw8ZmVYwOqZ54qJur8Tl3Hp33R7rQ/YMNIenR1wnRunNlV/g8O8xLzUM2qjW1p+XKK08SVI/EyDn1ZtNxyzuhBp1OYxwPVLD28I4r6e/nIEr8+HnBeaUX3y43AjL6x/rzr4KTyPeCNhOYLgcdLM3A5tO/ae+KPKWXBXOwkmxjq7aF6v1Qj5uC/X1Vyb8u6EZETbrx7yNymBHyWpqM4OfljCFyU1c1JjOjsEkhWzE9YoNzhG2bMTBbpUz1gSA/6UCqjhK+3LzneTR/ZmN4RmMlsqTM98E6SMiaGGhqTENIu1UwuPpzl4pv0LJdGoxvR+2aIOZrUI/mD8iuqNoy/gQGU36OiuKencbAVjXBOJXjZueW/VcJ4ivX6Ch4rnFONLKvL2z04cu9tD8IJQfJEmjEieSI44ZCh0LXrMZRJ9bjLpIbhnRbtZ4LP6eBCOtxOwiyKIoueN1y8Fk=" - -notifications: - slack: - secure: I4ZII92TFLy6vlyX98ns7BaFwA4Qo/o7Av2fnUQW6FfW13EF7Taregu20BIYFFMsiigXCAtvPjqH4HVLpZgK6gZXhbCuI8kl15ZsfRWXcgGSfGZw2De8YS845+QXjc0fq0i46IAVWIey/ImfJrmP7aqjQfWS3XRRpz1kVf7A3/UYghn4GYfJ4VvCglU+LI6qa5lbEXeZAWR0Ndelhuwj7cBSWlLNM2PEmhnf4FsOVQ986S0nmlmjybkYu2NmO+tBmoydjLr5cLt3U9maiLruJ/01ebxfML37W1GOGRUqkSc2G95TohKyiTkluL/HqBMiXXD7cXkuldpTLREnrdQqImyvqu5nq0Tr8vOjJ776LCHDFHv//CkBF1W8n7H9QHwEQonq+Hu2iPOec23Os0b1SlqLVc+1Fy88G7KkvFN430ugiJBzW5+Qk9TUE8CBwL4FixeO3nv0UYleigjGgrpYRL+yWPqwxEMQAWZN6W2YGY10rPYT0eooukEbmNphWzz/vFO4UCphMSMt6SLoN7r3br7DYLRUevdK8vrIUb1LUQPGMYf7WIdMnckme7y+oJ3SR2YO6+vs3EyQsF1AdJqpbvag0/AbWHFVi2vfwrvKZwperPLtXE+EXh8B+Ck62gcYsTyUuMpoEws/+DqHUFByOgDbPDFBmFYwPWCoZh4h3Rw= - -matrix: - fast_finish: true - include: - - env: TASK=core-tests - - env: TASK=checkstyle - - env: TASK=kompos-tests - - env: TASK=replay1-tests - - env: TASK=replay2-tests - # Disabled due to breaking changes in the tracing infrastructure. Not fixed to make merge of Snapshotting PR(#293) easier. - #- env: TASK=snapshot-tests - - env: TASK=native - - - os: linux - dist: trusty - jdk: openjdk11 - env: TASK=unit-tests - - - os: osx - osx_image: xcode9.3 - language: generic - env: TASK=unit-tests - -before_install: - - | - run() { - ID=`echo "$@" | sed -e 's/ /_/g'` - STR=`echo "$@"` - printf "travis_fold:start:$ID\n$STR\n" - eval "$@" - RESULT_EVAL=$? - printf "travis_fold:end:$ID\n" - return $RESULT_EVAL - } - if [ "$TRAVIS_OS_NAME" = "osx" ] - then - brew update - brew install ant - fi - - -install: | - printf "travis_fold:start:downloads\nLoad JDK and/or Eclipse\n" - - if [ "$TASK" = "checkstyle" ] - then - export ECLIPSE_TAR=eclipse.tar.gz - export ECLIPSE_URL=http://archive.eclipse.org/eclipse/downloads/drops4/R-4.6.3-201703010400/eclipse-SDK-4.6.3-linux-gtk-x86_64.tar.gz - wget --progress=bar:force ${ECLIPSE_URL} -O ${ECLIPSE_TAR} - tar -C ${TRAVIS_BUILD_DIR}/.. -xzf ${ECLIPSE_TAR} - export ECLIPSE_EXE=${TRAVIS_BUILD_DIR}/../eclipse/eclipse - fi - export ANT="ant -e" - printf "travis_fold:end:downloads\n" - - -script: - - if [ "$TASK" = "core-tests" ]; then $ANT core-tests && $ANT coverage; fi - - if [ "$TASK" = "checkstyle" ]; then $ANT checkstyle && $ANT eclipseformat-check && run cd tools/kompos && nvm install 7 && run npm install && run npm run lint; fi - - if [ "$TASK" = "kompos-tests" ]; then run nvm install 8 && $ANT && cd tools/kompos && run npm -s run verify && run npm test; fi - - if [ "$TASK" = "replay1-tests" ]; then $ANT compile && run ./tests/replay/test.sh 1; fi - - if [ "$TASK" = "replay2-tests" ]; then $ANT compile && run ./tests/replay/test.sh 2; fi - - if [ "$TASK" = "snapshot-tests" ]; then $ANT compile && run ./tests/snapshot/test.sh && $ANT serialization-tests; fi - - if [ "$TASK" = "unit-tests" ]; then $ANT compile && run ./som core-lib/TestSuite/TestRunner.ns; fi - - if [ "$TASK" = "native" ]; then $ANT native; fi From 6c5d19e75896e236b2685b159dbcc5539aef1da1 Mon Sep 17 00:00:00 2001 From: Stefan Marr Date: Mon, 12 Mar 2018 16:43:04 +0000 Subject: [PATCH 2/6] Adapting build to support windows Signed-off-by: Stefan Marr --- build.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.xml b/build.xml index c64e05df1..45514edcc 100644 --- a/build.xml +++ b/build.xml @@ -63,7 +63,12 @@ + + + + + @@ -143,7 +148,7 @@ - + From 0a3c0c03241c3c957cca53fa057d17ac369bd99d Mon Sep 17 00:00:00 2001 From: Stefan Marr Date: Mon, 12 Mar 2018 17:05:43 +0000 Subject: [PATCH 3/6] Try to get RDP access Signed-off-by: Stefan Marr --- .appveyor.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index 5e18765d7..cfbe4d654 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -2,6 +2,9 @@ version: build {build} {branch} image: Visual Studio 2017 +init: + - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) + install: - ps: | Add-Type -AssemblyName System.IO.Compression.FileSystem @@ -25,5 +28,8 @@ build_script: test_script: - som core-lib/TestSuite/TestRunner.ns +on_finish: + - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) + cache: - C:\ant From 5eab1abf096cdf7ae27f0e307c8d7dbff4fbb516 Mon Sep 17 00:00:00 2001 From: Stefan Marr Date: Tue, 20 Mar 2018 02:00:08 +0000 Subject: [PATCH 4/6] Disable RDP Signed-off-by: Stefan Marr --- .appveyor.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index cfbe4d654..ed6a2bb57 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -2,8 +2,8 @@ version: build {build} {branch} image: Visual Studio 2017 -init: - - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) +# init: +# - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) install: - ps: | @@ -23,13 +23,13 @@ install: - cmd: git submodule update --init --recursive build_script: - - ant compile + - ant compile test_script: - som core-lib/TestSuite/TestRunner.ns -on_finish: - - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) +# on_finish: +# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) cache: - C:\ant From c438566c9bfd69b1c9bc834e26d7a9ef1ef0d910 Mon Sep 17 00:00:00 2001 From: Stefan Marr Date: Tue, 20 Mar 2018 02:00:26 +0000 Subject: [PATCH 5/6] Try fixing mx.cmd Signed-off-by: Stefan Marr --- build.xml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/build.xml b/build.xml index 45514edcc..331c0fbe7 100644 --- a/build.xml +++ b/build.xml @@ -67,8 +67,8 @@ - - + + @@ -163,6 +163,20 @@ + + + + The used JDK needs to have JVMCI support, which is the case for Java 9. + If Java 8 is needed, see + http://www.oracle.com/technetwork/oracle-labs/program-languages/downloads/index.html + for a JVMCI JDK Download. + + + + + + + @@ -443,7 +457,7 @@ - + From 908f9203f34c99819c1d08110c38b4c3ae12dd93 Mon Sep 17 00:00:00 2001 From: Stefan Marr Date: Thu, 27 Sep 2018 23:18:23 +0100 Subject: [PATCH 6/6] Update ant zip url Signed-off-by: Stefan Marr --- .appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index ed6a2bb57..42e961a43 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -10,13 +10,13 @@ install: Add-Type -AssemblyName System.IO.Compression.FileSystem if (!(Test-Path -Path "C:\ant\apache-ant-1.10.2" )) { (new-object System.Net.WebClient).DownloadFile( - 'http://www.mirrorservice.org/sites/ftp.apache.org//ant/binaries/apache-ant-1.10.2-bin.zip', + 'https://www.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.zip', 'C:\ant-bin.zip' ) [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\ant-bin.zip", "C:\ant") } - - cmd: SET JAVA_HOME=C:\Program Files\Java\jdk9 - - cmd: SET PATH=C:\ant\apache-ant-1.10.2\bin;%JAVA_HOME%\bin;%PATH% + - cmd: SET JAVA_HOME=C:\Program Files\Java\jdk10 + - cmd: SET PATH=C:\ant\apache-ant-1.10.5\bin;%JAVA_HOME%\bin;%PATH% - cmd: echo %USERPROFILE% - cmd: echo %PATH% - cmd: java -version