Skip to content

Commit

Permalink
Merge pull request #1676 from guwirth/test-scanner-3.3
Browse files Browse the repository at this point in the history
use scanner 3.3.0.1492
  • Loading branch information
guwirth authored Jan 27, 2019
2 parents f24e449 + e96ba2f commit 43b1e0b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ install:
- unzip -qq sonarqube-7.4.zip
- travis_retry wget -q https://binaries.sonarsource.com/Distribution/sonarqube/sonarqube-7.5.zip
- unzip -qq sonarqube-7.5.zip
- travis_retry wget -q https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-3.2.0.1227.zip
- unzip -qq sonar-scanner-cli-3.2.0.1227.zip
- travis_retry wget -q https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-3.3.0.1492.zip
- unzip -qq sonar-scanner-cli-3.3.0.1492.zip
- travis_retry wget -q https://github.com/htacg/tidy-html5/archive/5.6.0.zip --output-document=tidy-html5.zip
- unzip -qq tidy-html5.zip
- pushd tidy-html5-5.6.0/build/cmake/
Expand All @@ -80,7 +80,7 @@ script:
- mvn install -B -e -V -DskipTests=true
- mvn test -B -e -V
- bash cxx-sensors/src/tools/check_rules.sh
- RAILS_ENV=production PATH=$PATH:/tmp/sonar-scanner-3.2.0.1227/bin TestDataFolder=~/build/SonarOpenCommunity/sonar-cxx/integration-tests/testdata behave --no-capture --tags=$SONARAPI
- RAILS_ENV=production PATH=$PATH:/tmp/sonar-scanner-3.3.0.1492/bin TestDataFolder=~/build/SonarOpenCommunity/sonar-cxx/integration-tests/testdata behave --no-capture --tags=$SONARAPI

after_failure:
- cat $SONARHOME/logs/sonar.log
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ install:
if (!(Test-Path -Path "C:\sonar-scanner" )) {
(new-object System.Net.WebClient).DownloadFile(
'https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-3.2.0.1227.zip',
'https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-3.3.0.1492.zip',
'C:\sonar-scanner-dist.zip'
)
[System.IO.Compression.ZipFile]::ExtractToDirectory("C:\sonar-scanner-dist.zip", "C:\sonar-scanner")
Expand All @@ -62,7 +62,7 @@ install:
$env:VCVARS_PLATFORM="amd64"
$env:LANG_PLATFORM="-x64"
}
- cmd: SET PATH=C:\maven\apache-maven-3.5.4\bin;%JAVA_HOME%\bin;C:\sonar-scanner\sonar-scanner-3.2.0.1227\bin;%PATH%
- cmd: SET PATH=C:\maven\apache-maven-3.5.4\bin;%JAVA_HOME%\bin;C:\sonar-scanner\sonar-scanner-3.3.0.1492\bin;%PATH%
- cmd: SET M2_HOME=C:\maven\apache-maven-3.5.4
- cmd: SET MAVEN_HOME=C:\maven\apache-maven-3.5.4
- cmd: SET SONARHOME=C:\sonarqube\sonarqube-6.7.6
Expand Down

0 comments on commit 43b1e0b

Please sign in to comment.