Skip to content

Commit

Permalink
Update status name for Travis build
Browse files Browse the repository at this point in the history
  • Loading branch information
mteodori committed Jan 16, 2020
1 parent 8c722b7 commit 37a4e4d
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 27 deletions.
7 changes: 2 additions & 5 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ pull_request_rules:
conditions:
- author=jx-activiti-cloud
- status-success=continuous-integration/jenkins/pr-head
#- status-success=continuous-integration/travis-ci/pr
- status-success=continuous-integration/travis-ci/push
#- status-success=license/cla
- status-success=Travis CI - Pull Request
- label!=do-not-merge
actions:
delete_head_branch: {}
Expand All @@ -18,8 +16,7 @@ pull_request_rules:
- "#review-requested=0"
- "#changes-requested-reviews-by=0"
- status-success=continuous-integration/jenkins/pr-head
#- status-success=continuous-integration/travis-ci/pr
- status-success=continuous-integration/travis-ci/push
- status-success=Travis CI - Pull Request
- status-success=license/cla
- label!=do-not-merge
actions:
Expand Down
35 changes: 15 additions & 20 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
language: java
sudo: required
services:
- docker

jdk:
- openjdk11

cache:
directories:
- $HOME/.m2
- ${HOME}/.m2/repository

services:
- docker

notifications:
webhooks:
urls:
Expand All @@ -15,21 +18,17 @@ notifications:
on_failure: always # options: [always|never|change] default: always
on_start: never # options: [always|never|change] default: always

branches:
only:
- master
- develop

before_script:
- echo MAVEN_OPTS=-Xmx1536m > ~/.mavenrc

install: mvn jar:jar install:install

jobs:
include:
# - stage: Check style
# name: Check style
# script:
# mvn checkstyle:check -DskipCheckstyle=false
- stage: Build and test
name: Build and test
script:
mvn verify -B -DskipITs=false
# Enable integration tests
script:
- mvn verify -B -DskipITs=false

# Send coverage data
after_success:
Expand All @@ -38,7 +37,3 @@ after_success:
after_failure:
- cat **/target/surefire-reports/*.xml | grep -B 1 -A 10 "<error"
- cat **/target/failsafe-reports/*.xml | grep -B 1 -A 10 "<error"

cache:
directories:
- $HOME/.m2
3 changes: 1 addition & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
</issueManagement>
<ciManagement>
<system>Travis</system>
<url>https://travis-ci.org/Activiti/${project.artifactId}</url>
<url>https://travis-ci.com/Activiti/${project.artifactId}</url>
</ciManagement>
<properties>
<!-- plugins -->
Expand Down Expand Up @@ -176,7 +176,6 @@
<consoleOutput>false</consoleOutput>
<logViolationsToConsole>false</logViolationsToConsole>
<failsOnError>false</failsOnError>
<linkXRef>false</linkXRef>
</configuration>
</execution>
</executions>
Expand Down

0 comments on commit 37a4e4d

Please sign in to comment.