Fix build

diff --git a/.travis.yml b/.travis.yml
index b1d977db9612f5ffb42d84483abb1af104a30754..6c1e20ca9cd6f13039cc4226f0d2f94f7ecafadc 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,9 +10,7 @@ script: ./travis.sh
 env:
   matrix:
     - TARGET=CI
-    - TARGET=IT SQ_VERSION=DEV
-    - TARGET=IT SQ_VERSION=5.1.2
-    - TARGET=IT SQ_VERSION=LTS
+    - TARGET=IT
 
 cache:
   directories:

diff --git a/appveyor.ps1 b/appveyor.ps1
index 4b1dd17a2ea8d026c37cadf47bac134a6ef72a11..7885abf5d5b0d84ef00c83cf48e83ab5d84d7f18 100644 (file)
--- a/appveyor.ps1
+++ b/appveyor.ps1
@@ -92,13 +92,11 @@ function Build
 
 function BuildSnapshot
 {
-       param ([string]$Project)
+        param ([string]$Project)
 
-       echo "Fetch and build latest green snapshot of [$Project]"
+        echo "Fetch and build snapshot of [$Project]"
 
-       $lastGreenSha1 = (new-object Net.WebClient).DownloadString("http://sonarsource-979.appspot.com/$Project/latestGreen")
-
-       Build $Project $lastGreenSha1
+        Build $Project "HEAD"
 }
 
 function CheckLastExitCode

diff --git a/travis.sh b/travis.sh
index a9164a00ee8cef2c3733225ee036ae241fbae63c..5fba28635f10020680f8e31fb1255d1706199439 100755 (executable)
--- a/travis.sh
+++ b/travis.sh
@@ -9,13 +9,27 @@ function configureTravis {
 }
 configureTravis
 
-regular_mvn_build_deploy_analyze
 
+case "$TARGET" in
 
-MIN_SQ_VERSION="LTS"
-echo '======= Run integration tests on minimal supported version of SonarQube ($MIN_SQ_VERSION)'
-cd it
-mvn -Dsonar.runtimeVersion="$MIN_SQ_VERSION" -Dmaven.test.redirectTestOutputToFile=false verify -e -B -V
+CI)
+  regular_mvn_build_deploy_analyze
+  ;;
 
+IT)
+  MIN_SQ_VERSION="LTS"
+  mvn install -DskipTests=true -Dsource.skip=true -Denforcer.skip=true -B -e -V
+
+  echo '======= Run integration tests on minimal supported version of SonarQube ($MIN_SQ_VERSION)'
+  cd it
+  mvn -Dsonar.runtimeVersion="$MIN_SQ_VERSION" -Dmaven.test.redirectTestOutputToFile=false verify -e -B -V
+  # all other versions of SQ are tested by the QA pipeline at SonarSource
+  ;;
+
+*)
+  echo "Unexpected TARGET value: $TARGET"
+  exit 1
+  ;;
+
+esac
 
-# all other versions of SQ are tested by the QA pipeline at SonarSource