Skip to content

Commit 1aa4b3f

Browse files
Merge branch 'dev' into master
2 parents 8ba2531 + 6cdfb1c commit 1aa4b3f

File tree

5 files changed

+42
-7
lines changed

5 files changed

+42
-7
lines changed

.github/workflows/draft-release.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,16 @@ on:
1010
milestone:
1111
types: [closed]
1212

13+
env:
14+
MVN_USR: ${{ secrets.MVN_USR }}
15+
MVN_PWD: ${{ secrets.MVN_PWD }}
16+
1317
jobs:
1418
release:
1519
runs-on: ubuntu-latest
20+
permissions:
21+
contents: write
22+
packages: read
1623
steps:
1724
- name: Check out repository code
1825
uses: actions/checkout@v2
@@ -28,7 +35,7 @@ jobs:
2835
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
2936
restore-keys: ${{ runner.os }}-m2
3037
- name: Build with Maven
31-
run: mvn -B clean package
38+
run: mvn -B clean package -s settings.xml
3239
- name: Create Release Notes
3340
uses: docker://decathlon/release-notes-generator-action:2.0.1
3441
env:

.github/workflows/java-continuous-integration.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,15 @@
88
name: Java CI
99

1010
on: [push, pull_request]
11+
env:
12+
MVN_USR: ${{ secrets.MVN_USR }}
13+
MVN_PWD: ${{ secrets.MVN_PWD }}
1114

1215
jobs:
13-
16+
1417
build:
18+
permissions:
19+
packages: read
1520
runs-on: ubuntu-latest
1621
name: Java 17 CI
1722
steps:
@@ -31,9 +36,11 @@ jobs:
3136
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
3237
restore-keys: ${{ runner.os }}-m2
3338
- name: Build with Maven
34-
run: mvn -B clean test package
39+
run: mvn -B clean test package -s settings.xml
3540

3641
code-analysis:
42+
permissions:
43+
packages: read
3744
runs-on: ubuntu-latest
3845
name: SonarCloud Code Analysis
3946
# It's not possible to launch an analysis on external pull requests
@@ -66,4 +73,4 @@ jobs:
6673
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6774
# SonarCloud access token should be generated from https://sonarcloud.io/account/security/
6875
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
69-
run: mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.organization=lequal -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN
76+
run: mvn clean -s settings.xml org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.organization=lequal -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ Here is the compatibility matrix of the plugin:
3636
| 3.0.1 | 4.1.2 | 7.9 -> 8.2 | Fortran |
3737
| 3.1.0 | 4.1.2 | 7.9 -> 9.9 | Fortran |
3838
| 3.1.1 | 4.1.2 | 7.9 -> 9.9 | Fortran |
39+
| 3.1.2 | 5.0.0 | 7.9 -> 9.9 | Fortran |
3940

4041
#### Run i-Code manually
4142
If you need help to run i-Code please refer to the [official user manual](https://github.com/cnescatlab/i-CodeCNES/wiki/User-Manual) or [i-Code issue tracker](https://github.com/cnescatlab/i-CodeCNES/issues).

pom.xml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,13 @@
8585
<id>jitpack.io</id>
8686
<url>https://jitpack.io</url>
8787
</repository>
88+
<repository>
89+
<id>github</id>
90+
<url>https://maven.pkg.github.com/cnescatlab/i-CodeCNES</url>
91+
<snapshots>
92+
<enabled>true</enabled>
93+
</snapshots>
94+
</repository>
8895
</repositories>
8996

9097
<dependencies>
@@ -95,10 +102,10 @@
95102
<scope>provided</scope>
96103
</dependency>
97104
<dependency>
98-
<groupId>com.github.lequal.i-CodeCNES</groupId>
105+
<groupId>fr.cnes.icode</groupId>
99106
<artifactId>icode-library</artifactId>
100-
<version>4.1.2</version>
101-
</dependency>
107+
<version>5.1.0</version>
108+
</dependency>
102109
<dependency>
103110
<groupId>commons-lang</groupId>
104111
<artifactId>commons-lang</artifactId>

settings.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
4+
http://maven.apache.org/xsd/settings-1.0.0.xsd">
5+
6+
<servers>
7+
<server>
8+
<id>github</id>
9+
<username>${env.MVN_USR}</username>
10+
<password>${env.MVN_PWD}</password>
11+
</server>
12+
</servers>
13+
</settings>

0 commit comments

Comments
 (0)