Merge branch 'develop' into codespace-cautious-rotary-phone-wr7qrxqq5…

…vprf5w67
Unity-Energy-and-renewable-energy · Jul 17, 2024 · 1236bbc · 1236bbc
2 parents 4b9cb05 + 89ac6c8
commit 1236bbc
Show file tree

Hide file tree

Showing 57 changed files with 1,574 additions and 1,343 deletions.
diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml
@@ -23,6 +23,7 @@ env:
   IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }}
   IS_PUSH: ${{ github.event_name == 'push' }}
   REF: ${{ inputs.target_branch =='' && github.ref_name || inputs.target_branch}}
+  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
 
 jobs:
 

diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml
@@ -1,12 +1,7 @@
-name: Check cpp formatting
+name: Check cpp formatting using clang 18.1.3
 
 on:
-  push:
-    branches:
-      - develop
-      - feature/*
-      - features/*
-      - fix/*
+  pull_request:
 
 jobs:
   build:
@@ -28,7 +23,7 @@ jobs:
         run: |
           DIFF=`git status --porcelain`
           if [[ $DIFF ]]; then
-          echo "The following files are not well formatted"
+          echo "The following files are not well formatted, please make sure to use clang-format 18.1.3"
           echo "$DIFF"
           exit 1
           else

diff --git a/.github/workflows/oracle8.yml b/.github/workflows/oracle8.yml
@@ -142,13 +142,15 @@ jobs:
            cpack -G TGZ
 
     - name: Installer TGZ push
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
+        name: targz
         path: _build/*.tar.gz
 
     - name: Installer RPM push
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
+        name: rpm
         path: _build/*.rpm
 
     - name: Publish assets

diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
@@ -1,10 +1,10 @@
 name: SonarCloud
 
 on:
+  pull_request:
   push:
     branches:
       - develop
-    pull_request:
 
 jobs:
   sonarcloud:

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -132,13 +132,15 @@ jobs:
            cd _build
            ctest -C Release --output-on-failure
 
-      # simtest
       - name: Read simtest version
-        id: simtest-version
-        uses: notiz-dev/github-action-json-property@release
-        with:
-          path: 'simtest.json'
-          prop_path: 'version'
+        run: |
+          echo 'SIMTEST_JSON<<EOF' >> $GITHUB_ENV
+          cat ./simtest.json >> $GITHUB_ENV
+          echo 'EOF' >> $GITHUB_ENV
+
+      - name: Export simtest version
+        run: |
+          echo "SIMTEST=${{ fromJson(env.SIMTEST_JSON).version }}" >> $GITHUB_ENV
 
       - name: Init submodule
         run: |
@@ -148,7 +150,7 @@ jobs:
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: valid-named-mps
           os: ${{ env.os }}
           variant: "named-mps"
@@ -176,72 +178,80 @@ jobs:
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: valid-v830
           os: ${{ env.os }}
 
       - name: Run MILP with CBC
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: valid-milp
           variant: "milp-cbc"
           os: ${{ env.os }}
 
-      - name: Run tests introduced in v860
+      - name: Run tests introduced in 8.6.0
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: valid-v860
           os: ${{ env.os }}
 
-      - name: Run tests introduced in v870
+      - name: Run tests introduced in 8.7.0
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: valid-v870
           os: ${{ env.os }}
 
-      - name: Run tests introduced in v910
+      - name: Run tests introduced in 9.1.0
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: valid-v910
           os: ${{ env.os }}
 
+      - name: Run tests introduced in 9.2.0
+        if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
+        uses: ./.github/workflows/run-tests
+        with:
+          simtest-tag: ${{ env.SIMTEST }}
+          batch-name: valid-v920
+          os: ${{ env.os }}
+
       - name: Run short-tests
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: short-tests
           os: ${{ env.os }}
 
       - name: Run mps tests
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: valid-mps
           os: ${{ env.os }}
 
       - name: Run tests for adequacy patch (CSR)
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: adequacy-patch-CSR
           os: ${{ env.os }}
 
       - name: Run parallel tests
         if: ${{ env.RUN_EXTENDED_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: valid-parallel
           os: ${{ env.os }}
           variant: "parallel"
@@ -250,7 +260,7 @@ jobs:
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: ts-generator
           os: ${{ env.os }}
           variant: "tsgenerator"
@@ -259,31 +269,31 @@ jobs:
         if: ${{ env.RUN_EXTENDED_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: medium-tests
           os: ${{ env.os }}
 
       - name: Run long-tests-1
         if: ${{ env.RUN_EXTENDED_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: long-tests-1
           os: ${{ env.os }}
 
       - name: Run long-tests-2
         if: ${{ env.RUN_EXTENDED_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: long-tests-2
           os: ${{ env.os }}
 
       - name: Run long-tests-3
         if: ${{ env.RUN_EXTENDED_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: long-tests-3
           os: ${{ env.os }}