Update core to 6.2.0-RC1 and use main branch for open-loadflow

Signed-off-by: Olivier Perrin <olivier.perrin@rte-france.com>
powsybl · Jan 24, 2024 · 4bdf360 · 4bdf360
1 parent 38f420b
commit 4bdf360
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -25,6 +25,15 @@ jobs:
       with:
         java-version: 17
 
+    - name: Checkout powsybl-open-loadflow latest sources
+      uses: actions/checkout@v1
+      with:
+        repository: powsybl/powsybl-open-loadflow
+        ref: refs/heads/main
+
+    - 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

diff --git a/emf/src/test/java/com/powsybl/emf/IGMmergeTests.java b/emf/src/test/java/com/powsybl/emf/IGMmergeTests.java
@@ -199,6 +199,7 @@ void testCompareSubnetworksMergeAgainstAssembled() {
             dl.setQ0(0);
         }
         Network assembled = createCGM();
+        //TODO This test fails because in `assembled` the dangling lines have non-zero values for p0 and q0.
         compareNetwork(assembled, merged);
     }
 

diff --git a/pom.xml b/pom.xml
@@ -58,8 +58,8 @@
 
     <properties>
         <java.version>17</java.version>
-        <powsyblcore.version>6.1.1</powsyblcore.version>
-        <powsyblopenloadflow.version>1.6.0</powsyblopenloadflow.version>
+        <powsyblcore.version>6.2.0-RC1</powsyblcore.version>
+        <powsyblopenloadflow.version>1.7.0-SNAPSHOT</powsyblopenloadflow.version>
         <sonar.coverage.jacoco.xmlReportPaths>
             ../distribution-entsoe/target/site/jacoco-aggregate/jacoco.xml,
             ../../distribution-entsoe/target/site/jacoco-aggregate/jacoco.xml,