[incubator-netbeans] branch master updated: Run two travis builds in parallel. Test signatures against latest release.

[jl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git


The following commit(s) were added to refs/heads/master by this push:
     new fee85fa  Run two travis builds in parallel. Test signatures against latest release.
fee85fa is described below

commit fee85fa93a6d4b2bb834fda4a50368bce2b3a047
Author: Jaroslav Tulach <ja...@apidesign.org>
AuthorDate: Fri Aug 17 18:04:56 2018 +0200

    Run two travis builds in parallel. Test signatures against latest release.
---
 .travis.yml                                               | 14 +++++++++-----
 nbbuild/antsrc/org/netbeans/nbbuild/ModuleListParser.java |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5b6a0e6..03b7dd7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,9 +18,13 @@ language: java
 jdk:
   - oraclejdk8
 script:
-  - (ant -quiet build-source-config && mkdir scratch && cd scratch && unzip -qq ../nbbuild/build/basic-src* && ant -quiet rat -Drat-report.haltonfailure=true && cd .. && rm -rf scratch)
+  - if [ "x$RAT" == "xtrue" ]; then (ant -quiet build-source-config && mkdir scratch && cd scratch && unzip -qq ../nbbuild/build/basic-src* && ant -quiet rat -Drat-report.haltonfailure=true && cd .. && rm -rf scratch); fi
   - ant -quiet build -Djavac.compilerargs=-nowarn -Dbuild.compiler.deprecation=false
-  - ant -quiet test -Djavac.compilerargs=-nowarn -Dbuild.compiler.deprecation=false -Dtest.includes=NoTestsJustBuild
-  - ant -quiet verify-libs-and-licenses -Dverify-libs-and-licenses.haltonfailure=true
-  - ant -quiet -f ide.ergonomics/ test -Dtest.config=commit
-  - ./travis-check-line-endings.sh
+  - if [ "x$COMPILETEST" == "xtrue" ]; then ant -quiet test -Djavac.compilerargs=-nowarn -Dbuild.compiler.deprecation=false -Dtest.includes=NoTestsJustBuild; fi
+  - if [ "x$LICENSE" == "xtrue" ]; then ant -quiet verify-libs-and-licenses -Dverify-libs-and-licenses.haltonfailure=true; fi
+  - if [ "x$EOL" == "xtrue" ]; then ./travis-check-line-endings.sh; fi
+  - if [ "x$SIGTEST" == "xtrue" ]; then ant check-sigtests; fi
+  - if [ "x$CV" == "xtrue" ]; then ant -quiet -f ide.ergonomics/ test -Dtest.config=commit; fi
+env:
+  - SIGTEST=false COMPILETEST=true RAT=true EOL=false LICENSE=true CV=false
+  - SIGTEST=true COMPILETEST=false RAT=false EOL=true LICENSE=false CV=true
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/ModuleListParser.java b/nbbuild/antsrc/org/netbeans/nbbuild/ModuleListParser.java
index b4496fd..1c4b0dd 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/ModuleListParser.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/ModuleListParser.java
@@ -126,7 +126,7 @@ final class ModuleListParser {
                             while (tok2.hasMoreTokens()) {
                                 String module = tok2.nextToken();
                                 standardModules.add(module);
-                                doFastScan |= new File(root, module.replace('/', File.separatorChar)).equals(basedirF);
+                                // doFastScan |= new File(root, module.replace('/', File.separatorChar)).equals(basedirF);
                             }
                         }
                     }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists