Skip to content

Commit

Permalink
use mvn wrapper for ci
Browse files Browse the repository at this point in the history
- lock maven version, not dependent for system install
- simpilfy appveyor ci, no need maven install manually
  • Loading branch information
Jerry Lee committed Mar 21, 2018
1 parent 3e1513d commit b63e2a6
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 16 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,13 @@ before_install:
- ls -l /usr/lib/jvm
- echo "JAVA_HOME=$JAVA_HOME"
- echo "PATH=$PATH"
- mvn --version
- ./mvnw --version

- pip install --user codecov

script:
- mvn test -B
- ./mvnw clean install --batch-mode
- echo "Run Agent test"
- ./run-agent-test.sh skip

after_success:
Expand Down
20 changes: 6 additions & 14 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build: off
clone_depth: 5
branches:
except:
- travis-ci
- travis-ci.*

environment:
matrix:
Expand All @@ -20,33 +20,25 @@ init:
- ps: "ls 'C:/Program Files (x86)/Java/jdk*'"

install:
- ps: |
Add-Type -AssemblyName System.IO.Compression.FileSystem
if (!(Test-Path -Path "C:\maven\apache-maven-3.2.5")) {
(new-object System.Net.WebClient).DownloadFile(
'http://www.us.apache.org/dist/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.zip',
'C:\maven-bin.zip'
)
[System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven")
}
- cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;%JAVA_HOME%\bin;%PATH%
- cmd: SET M2_HOME=C:\maven\apache-maven-3.2.5
- cmd: SET MAVEN_OPTS=-Xmx768m -XX:MaxPermSize=128m
- cmd: SET JAVA_OPTS=-Xmx768m -XX:MaxPermSize=128m
- "ECHO JAVA_HOME=%JAVA_HOME%, HOMEPATH=%HOMEPATH%, PATH=%PATH%"
- cmd: mvn --version
- cmd: ./mvnw.cmd --version

test_script:
- mvn clean install --batch-mode
- mvn dependency:copy-dependencies -DincludeScope=test
- ./mvnw.cmd clean install --batch-mode
- ./mvnw.cmd dependency:copy-dependencies -DincludeScope=test
- rm target/dependency/javassist*
- echo "Run Agent test"
- ps: |
$ttl_jar=Get-ChildItem target\transmittable-thread-local-*.jar -Exclude *-sources.jar | Select-Object -ExpandProperty FullName
$cp=Get-ChildItem target\dependency\*.jar | Select-Object -ExpandProperty FullName
$cp=$cp + 'target\test-classes'
$cp=$cp -join ';'
echo "java -Xmx256m -Xms256m -Xbootclasspath/a:$ttl_jar -javaagent:$ttl_jar -cp $cp -ea com.alibaba.ttl.threadpool.agent.AgentCheck"
$output = java -Xmx256m -Xms256m -Xbootclasspath/a:$ttl_jar -javaagent:$ttl_jar -cp $cp -ea com.alibaba.ttl.threadpool.agent.AgentCheck 2>&1
$output=java -Xmx256m -Xms256m -Xbootclasspath/a:$ttl_jar -javaagent:$ttl_jar -cp $cp -ea com.alibaba.ttl.threadpool.agent.AgentCheck 2>&1
$output.CategoryInfo.TargetName | Out-Default
cache:
Expand Down

0 comments on commit b63e2a6

Please sign in to comment.