LIBS-645 - Update GH Actions configuration and Readme maven badged (#6)

avides · Jan 25, 2020 · e99da30 · e99da30
1 parent 20f9941
commit e99da30
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 17 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -30,7 +30,7 @@ jobs:
         run: mvn surefire:test
 
       - name: integration-tests
-        run: mvn jacoco:restore-instrumented-classes failsafe:integration-test failsafe:verify
+        run: mvn -DskipUTs -Dgpg.skip=true jacoco:restore-instrumented-classes verify
 
       - name: sonar-analyse
         env:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,19 +16,18 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 11
+          server-id: ossrh
+          server-username: OSSRH_USERNAME
+          server-password: OSSRH_PASSWORD
+
+      - name: setup-github-release
+        run: sed -i -e 's/<\/servers>/<server><id>github<\/id><username>x-access-token<\/username><password>${GITHUB_TOKEN}<\/password><\/server><\/servers>/g' /home/runner/.m2/settings.xml
 
       - name: setup-gpg
         env:
           GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
         run: echo ${GPG_PRIVATE_KEY} | base64 --decode | gpg --batch --import
 
-      - name: setup-maven-settings
-        uses: s4u/maven-settings-action@v1
-        with:
-          servers: '[{"id": "ossrh", "username": "${OSSRH_USERNAME}", "password": "${OSSRH_PASSWORD}"}, {"id": "github", "username": "x-access-token", "password": "${GITHUB_TOKEN}"}]'
-          properties: '[{"gpg.executable": "gpg"}, {"gpg.passphrase": "${GPG_PASSPHRASE}"}]'
-          sonatypeSnapshots: true
-
       - name: checkout
         uses: actions/checkout@v1
 
@@ -39,18 +38,18 @@ jobs:
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-maven-
 
+      - name: deploy
+        env:
+          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+        run: mvn clean verify deploy -Dgpg.executable=gpg -Dgpg.passphrase=${GPG_PASSPHRASE}
+
       - name: sonar-analyse
         run: |
           export SONAR_ORGANIZATION=$(echo ${GITHUB_REPOSITORY} | cut -d / -f 1)
-          mvn clean verify sonar:sonar \
+          mvn sonar:sonar \
             -Dsonar.host.url=https://sonarcloud.io/ \
             -Dsonar.login=${{ secrets.SONAR_TOKEN }} \
             -Dsonar.organization=${SONAR_ORGANIZATION} \
             -Dsonar.projectKey=${GITHUB_REPOSITORY//\//_} \
             -Dsonar.java.binaries=./target/classes
-
-      - name: deploy
-        env:
-          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-        run: mvn deploy
diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml
@@ -31,7 +31,7 @@ jobs:
         run: mvn surefire:test
 
       - name: integration-tests
-        run: mvn jacoco:restore-instrumented-classes failsafe:integration-test failsafe:verify
+        run: mvn -DskipUTs -Dgpg.skip=true jacoco:restore-instrumented-classes verify
 
       - name: sonar-analyse
         env:
@@ -45,6 +45,7 @@ jobs:
             -Dsonar.organization=${SONAR_ORGANIZATION} \
             -Dsonar.projectKey=${GITHUB_REPOSITORY//\//_} \
             -Dsonar.pullrequest.key=${GITHUB_PULL_REQUEST} \
+            -Dsonar.pullrequest.branch=${GITHUB_REF} \
             -Dsonar.java.binaries=./target/classes
 
       - name: pom-analyse

diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,5 @@
 /.settings/
 /.classpath
 /.project
+/.idea
+/*.iml
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # sax-xom-parser
 
-[![Maven Central](https://img.shields.io/maven-metadata/v/http/central.maven.org/maven2/com/avides/xml/sax-xom-parser/maven-metadata.xml.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.avides.xml%22%20AND%20a%3A%22sax-xom-parser%22)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.avides.xml/sax-xom-parser/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.avides.xml/sax-xom-parser)
 [![Build](https://github.com/avides/sax-xom-parser/workflows/release/badge.svg)](https://github.com/avides/sax-xom-parser/actions)
 [![Nightly build](https://github.com/avides/sax-xom-parser/workflows/nightly/badge.svg)](https://github.com/avides/sax-xom-parser/actions)
 [![Coverage report](https://sonarcloud.io/api/project_badges/measure?project=avides_sax-xom-parser&metric=coverage)](https://sonarcloud.io/dashboard?id=avides_sax-xom-parser)