Merge branch 'core_6_5_0_RC1' into dynamic_simulation_fsv

Signed-off-by: Florian Dupuy <[email protected]>
powsybl · Oct 1, 2024 · 28aae42 · 28aae42
2 parents 4c6ec60 + 7824203
commit 28aae42
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -18,40 +18,28 @@ jobs:
 
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4
-        with:
-          path: main
-
-      - name: Checkout powsybl-core branch
-        uses: actions/checkout@v4
-        with:
-          repository: powsybl/powsybl-core
-          ref: refs/heads/dynamic_simulation_fsv
-          path: powsybl-core
+        uses: actions/checkout@v1
 
       - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
           java-version: 17
 
-      - name: Build and install powsybl-core with Maven
-        run: mvn --batch-mode -DskipTests=true --file ./powsybl-core/pom.xml install
-
       - name: Build with Maven
         if: matrix.os == 'ubuntu-latest'
-        run: mvn --batch-mode -Pintegration-tests,jacoco --file ./main/pom.xml install
+        run: mvn --batch-mode -Pintegration-tests,jacoco install
 
       - name: Build with Maven
         if: matrix.os != 'ubuntu-latest'
-        run: mvn --batch-mode --file ./main/pom.xml install
+        run: mvn --batch-mode install
 
       - name: Run SonarCloud analysis
         if: matrix.os == 'ubuntu-latest'
         run: >
-          mvn --batch-mode -DskipTests --file ./main/pom.xml sonar:sonar
+          mvn --batch-mode -DskipTests sonar:sonar
           -Dsonar.host.url=https://sonarcloud.io
           -Dsonar.organization=powsybl-ci-github
           -Dsonar.projectKey=com.powsybl:powsybl-dynawo
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/pom.xml b/pom.xml
@@ -57,7 +57,7 @@
 
     <properties>
         <java.version>17</java.version>
-        <powsybl-core.version>6.5.0-SNAPSHOT</powsybl-core.version>
+        <powsybl-core.version>6.5.0-RC1</powsybl-core.version>
         <groovy.version>4.0.14</groovy.version> <!-- used for groovy-json but also for groovydoc (dynawo-dsl) -->
         <asciitable.version>0.3.2</asciitable.version>
         <sonar.coverage.jacoco.xmlReportPaths>