Merge branch '6.7.0-SNAPSHOT' into feature/remove_cgmes_control_area

# Conflicts: # pom.xml
powsybl · Feb 21, 2025 · 0038412 · 0038412
2 parents 8becd22 + 1fc8d70
commit 0038412
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 5 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -18,25 +18,47 @@ jobs:
 
     steps:
     - name: Checkout sources
-      uses: actions/checkout@v1
+      uses: actions/checkout@v4
+      with:
+        path: main
+
+    - name: Checkout powsybl-core branch
+      uses: actions/checkout@v4
+      with:
+        repository: powsybl/powsybl-core
+        ref: refs/heads/main
+        path: powsybl-core
+
+    - name: Checkout powsybl-open-loadflow branch
+      uses: actions/checkout@v4
+      with:
+        repository: powsybl/powsybl-open-loadflow
+        ref: refs/heads/main
+        path: powsybl-open-loadflow
 
     - 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 and install powsybl-open-loadflow with Maven
+      run: mvn --batch-mode -DskipTests=true --file ./powsybl-open-loadflow/pom.xml install
+
     - name: Build with Maven
       if: matrix.os == 'ubuntu-latest'
-      run: mvn --batch-mode -Pjacoco install
+      run: mvn --batch-mode -Pjacoco --file ./main/pom.xml install
 
     - name: Build with Maven
       if: matrix.os != 'ubuntu-latest'
-      run: mvn --batch-mode install
+      run: mvn --batch-mode --file ./main/pom.xml install
 
     - name: Run SonarCloud analysis
       if: matrix.os == 'ubuntu-latest'
       run: >
-        mvn --batch-mode -DskipTests sonar:sonar
+        mvn --batch-mode -DskipTests --file ./main/pom.xml sonar:sonar
         -Dsonar.host.url=https://sonarcloud.io
         -Dsonar.organization=powsybl-ci-github
         -Dsonar.projectKey=com.powsybl:powsybl-entsoe

diff --git a/flow-decomposition/src/test/java/com/powsybl/flow_decomposition/TestUtils.java b/flow-decomposition/src/test/java/com/powsybl/flow_decomposition/TestUtils.java
@@ -79,6 +79,7 @@ public static Network getMicroGridNetworkWithBusBarSectionOnly() {
         Network network = Importers.importData("CGMES", CgmesConformity3ModifiedCatalog.microGridBE3DanglingLinesSameBoundary1Disconnected().dataSource(), null);
         network.getShuntCompensator("d771118f-36e9-4115-a128-cc3d9ce3e3da").remove();
         network.getShuntCompensator("002b0a40-3957-46db-b84a-30420083558f").remove();
+        network.getStaticVarCompensator("3c69652c-ff14-4550-9a87-b6fdaccbb5f4").remove();
         assertEquals(5, network.getBusbarSectionCount());
         assertEquals(0, network.getShuntCompensatorCount());
         assertEquals(0, network.getStaticVarCompensatorCount());
@@ -92,6 +93,7 @@ public static Network getMicroGridNetworkWithShuntCompensatorOnly() {
         network.getBusbarSection("364c9ca2-0d1d-4363-8f46-e586f8f66a8c").remove();
         network.getBusbarSection("ef45b632-3028-4afe-bc4c-a4fa323d83fe").remove();
         network.getBusbarSection("fd649fe1-bdf5-4062-98ea-bbb66f50402d").remove();
+        network.getStaticVarCompensator("3c69652c-ff14-4550-9a87-b6fdaccbb5f4").remove();
         assertEquals(0, network.getBusbarSectionCount());
         assertEquals(2, network.getShuntCompensatorCount());
         assertEquals(0, network.getStaticVarCompensatorCount());

diff --git a/pom.xml b/pom.xml
@@ -59,7 +59,7 @@
     <properties>
         <java.version>17</java.version>
         <powsyblcore.version>6.7.0-SNAPSHOT</powsyblcore.version>
-        <powsyblopenloadflow.version>1.14.0</powsyblopenloadflow.version>
+        <powsyblopenloadflow.version>1.15.0-SNAPSHOT</powsyblopenloadflow.version>
         <sonar.coverage.jacoco.xmlReportPaths>
             ../distribution-entsoe/target/site/jacoco-aggregate/jacoco.xml,
             ../../distribution-entsoe/target/site/jacoco-aggregate/jacoco.xml,