Skip to content

Commit 05c939f

Browse files
authored
Merge pull request #318 from sdinot/update-ci-env
Update CI/CD pipeline and environment to the new SonarQube requirements
2 parents a8fe2cf + 130cf42 commit 05c939f

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

.github/workflows/maven.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,28 @@ jobs:
77
name: Build
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v3
11-
- name: Set up JDK 8
12-
uses: actions/setup-java@v3
10+
- uses: actions/checkout@v4
11+
- name: Set up JDK 11
12+
uses: actions/setup-java@v4
1313
with:
14-
distribution: 'zulu'
15-
java-version: 8
14+
distribution: 'temurin'
15+
java-version: 11
1616
- name: Build with Maven
1717
run: mvn -B -U -f pom.xml install checkstyle:checkstyle
1818
- name: SonarQube scan
1919
run: |
2020
if [ $PROJECT_KEY != 'Hipparchus-Math/hipparchus' ] ; then export KEY_OPTION="-Dsonar.projectKey=${PROJECT_KEY/\//:}" ; fi
2121
if [ $PROJECT_KEY != 'Hipparchus-Math/hipparchus' ] ; then export PROJECT_NAME="$PROJECT_NAME ($PROJECT_KEY)" ; fi
22-
mvn -B -f pom.xml sonar:sonar -Dsonar.login=$SONARQUBE_TOKEN -Dsonar.branch.name=${GITHUB_REF##*/} $KEY_OPTION -Dsonar.projectName="$PROJECT_NAME"
22+
mvn -B -f pom.xml sonar:sonar \
23+
-Dsonar.host.url=$SONARQUBE_HOST_URL \
24+
-Dsonar.login=$SONARQUBE_TOKEN \
25+
-Dsonar.branch.name=${GITHUB_REF##*/} \
26+
-Dsonar.projectName="$PROJECT_NAME" \
27+
\
28+
$KEY_OPTION
2329
env:
2430
SONARQUBE_TOKEN: ${{ secrets.SONARQUBE_TOKEN }}
31+
SONARQUBE_HOST_URL: ${{ vars.SONARQUBE_HOST_URL }}
2532
PROJECT_KEY: ${{ github.repository }}
2633
PROJECT_NAME: 'Hipparchus'
2734
KEY_OPTION: ''

hipparchus-parent/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -530,8 +530,6 @@
530530
<hipparchus.hamcrest.version>2.2</hipparchus.hamcrest.version>
531531
<hipparchus.reflow-velocity-tools.version>2.0.0</hipparchus.reflow-velocity-tools.version>
532532
<hipparchus.mathjax.enable>&lt;script src=&quot;https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js&quot; id=&quot;MathJax-script&quot;&gt;&lt;/script&gt;</hipparchus.mathjax.enable>
533-
<!-- sonar related properties -->
534-
<sonar.host.url>https://sonar.orekit.org/</sonar.host.url>
535533
</properties>
536534

537535
<build>

0 commit comments

Comments
 (0)