Skip to content

Commit 110509d

Browse files
committed
[actions] Tweak boarding, adjust travis, remove travis pushes to sonar/sonatype
1 parent b2aff76 commit 110509d

File tree

6 files changed

+11
-23
lines changed

6 files changed

+11
-23
lines changed

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2009-2020 the original author or authors.
2+
# Copyright 2010-2020 the original author or authors.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2009-2020 the original author or authors.
2+
# Copyright 2010-2020 the original author or authors.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
1616

1717
name: Java CI
1818

19-
on: [push]
19+
on: [push, pull_request]
2020

2121
jobs:
2222
test:

.github/workflows/sonar.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2009-2020 the original author or authors.
2+
# Copyright 2010-2020 the original author or authors.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.

.github/workflows/sonatype.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2009-2020 the original author or authors.
2+
# Copyright 2010-2020 the original author or authors.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.

.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
language: java
22

33
jdk:
4-
- openjdk16
5-
- openjdk15
6-
- openjdk11
74
- openjdk8
85

96
services:

travis/after_success.sh

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,33 +25,24 @@ echo "Current commit detected: ${commit_message}"
2525
# artifacts on a Maven repository, should only be made for one version.
2626

2727
# If the version is 1.8, then perform the following actions.
28-
# 1. Upload artifacts to Sonatype.
29-
# 2. Use -q option to only display Maven errors and warnings.
30-
# 3. Use --settings to force the usage of our "settings.xml" file.
31-
# 4. Notify Coveralls.
32-
# 5. Deploy site
28+
# 1. Notify Coveralls.
29+
# 2. Deploy site (disabled as solution not complete).
30+
31+
# Parameters
32+
# 1. Use -q option to only display Maven errors and warnings.
33+
# 2. Use --settings to force the usage of our "settings.xml" file.
3334

3435
if [ $TRAVIS_REPO_SLUG == "mybatis/mybatis-3" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ] && [[ "$commit_message" != *"[maven-release-plugin]"* ]]; then
3536

3637
if [ $TRAVIS_JDK_VERSION == "openjdk8" ]; then
3738

38-
# Deploy to sonatype
39-
./mvnw clean deploy -Dmaven.test.skip=true -q --settings ./mvn/settings.xml
40-
echo -e "Successfully deployed SNAPSHOT artifacts to Sonatype under Travis job ${TRAVIS_JOB_NUMBER}"
41-
4239
./mvnw clean test jacoco:report coveralls:report -q --settings ./mvn/settings.xml
4340
echo -e "Successfully ran coveralls under Travis job ${TRAVIS_JOB_NUMBER}"
4441

45-
./mvnw sonar:sonar -Dsonar.projectKey=mybatis_mybatis-3
46-
4742
# Deploy to site
4843
# Cannot currently run site this way
4944
# ./mvnw site site:deploy -q --settings ./mvn/settings.xml
5045
# echo -e "Successfully deploy site under Travis job ${TRAVIS_JOB_NUMBER}"
51-
52-
# Deploy to sonar
53-
./mvnw clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=ccf0be39fd0ca5ea5aa712247c79da7233cd3caa -q --settings ./mvn/settings.xml
54-
echo -e "Successfully ran Sonar integration under Travis job ${TRAVIS_JOB_NUMBER}"
5546
else
5647
echo "Java Version does not support additonal activity for travis CI"
5748
fi

0 commit comments

Comments
 (0)