Skip to content

Commit 1ab6b61

Browse files
committed
Improve workflows [skip ci]
1 parent 5e982a1 commit 1ab6b61

File tree

3 files changed

+9
-26
lines changed

3 files changed

+9
-26
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
name: Build pull request
1+
name: Build
22
on:
33
pull_request:
44
branches:
55
- master
6+
push:
7+
branches:
8+
- master
69
jobs:
710
maven-package:
811
runs-on: ubuntu-24.04
912
steps:
1013
- uses: actions/checkout@v5
1114
with:
1215
fetch-depth: 0
13-
- name: Copy maven settings
14-
run: |
15-
wget https://raw.githubusercontent.com/entur/ror-maven-settings/master/.m2/settings.xml -O .github/workflows/settings.xml
1616
- uses: actions/setup-java@v5
1717
with:
1818
java-version: 17.0.13
@@ -27,7 +27,7 @@ jobs:
2727
${{ runner.os }}-maven-
2828
${{ runner.os }}-
2929
- name: Run maven build
30-
run: mvn verify -s .github/workflows/settings.xml -PprettierCheck -Dprettier.nodePath=node -Dprettier.npmPath=npm
30+
run: mvn verify -PprettierCheck -Dprettier.nodePath=node -Dprettier.npmPath=npm
3131
- name: codecov
3232
uses: codecov/codecov-action@v5
3333
with:

.github/workflows/deploy.yml

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build and Deploy Maven Central
1+
name: Deploy Maven Central
22

33
concurrency:
44
group: deploy-master
@@ -40,26 +40,8 @@ jobs:
4040
${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
4141
${{ runner.os }}-maven-
4242
${{ runner.os }}-
43-
4443
- name: Run maven build
45-
run: mvn verify -s .github/workflows/settings.xml -PprettierCheck -Dprettier.nodePath=node -Dprettier.npmPath=npm
46-
- name: Sonar Scan
47-
env:
48-
SONAR_TOKEN: ${{ secrets.ENTUR_SONAR_PASSWORD }}
49-
SONAR_PROJECT_NAME: ${{ github.event.repository.name }}
50-
SONAR_PROJECT_KEY: entur_${{ github.event.repository.name }}
51-
run: |
52-
mvn -Psonar -s .github/workflows/settings.xml \
53-
sonar:sonar \
54-
-Dsonar.projectKey=${SONAR_PROJECT_KEY} \
55-
-Dsonar.organization=enturas-github \
56-
-Dsonar.projectName=${SONAR_PROJECT_NAME} \
57-
-Dsonar.host.url=https://sonarcloud.io \
58-
-Dsonar.token=${SONAR_TOKEN}
59-
- name: codecov
60-
uses: codecov/codecov-action@v5
61-
with:
62-
files: ./**/target/site/jacoco/jacoco.xml
44+
run: mvn package -s .github/workflows/settings.xml -PprettierCheck -Dprettier.nodePath=node -Dprettier.npmPath=npm
6345
- name: Upload artifact
6446
uses: actions/upload-artifact@v4.6.2
6547
with:

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
![Build and Deploy Maven Central](https://github.com/entur/gbfs-validator-java/actions/workflows/deploy.yml/badge.svg)
1+
![Build](https://github.com/entur/gbfs-validator-java/actions/workflows/build.yml/badge.svg?branch=master)
2+
![Deploy Maven Central](https://github.com/entur/gbfs-validator-java/actions/workflows/deploy.yml/badge.svg)
23
[![codecov](https://codecov.io/gh/entur/gbfs-validator-java/graph/badge.svg?token=WP0DSLPSVR)](https://codecov.io/gh/entur/gbfs-validator-java)
34

45
# gbfs-validator-java

0 commit comments

Comments
 (0)