resolve merge conflict in Modelica\Blocks\Sources.mo

Author: MatthiasBSchaefer

.github/workflows/CI_ReSim_trigger.yml

@@ -0,0 +1,18 @@
+name: Trigger CI ReSim
+
+on:
+  pull_request:
+  workflow_dispatch:
+  
+env:
+  EVENT_NUMBER:  ${{ github.event.number }}
+  PR_SHA: ${{ github.event.pull_request.base.sha }}
+  
+jobs:
+  get_PR_data:
+    runs-on: ubuntu-latest
+    steps:
+      - name: print vars
+        run: |
+            echo "Event Number: ${{ env.EVENT_NUMBER  }}"
+            echo "PR Base Hash: ${{ env.PR_SHA  }}"             

.github/workflows/PRTesting.yml

@@ -0,0 +1,49 @@
+name: CI ReSim
+
+on:
+  workflow_run:
+    workflows: ["Trigger CI ReSim"]
+    types:
+      - completed
+
+env:
+    PR_SERVER: ${{ vars.LTX_PR_SERVER }}
+    TESTING_TOOLS: ${{ vars.LTX_TESTING_TOOLS }}
+    EVENT_NUMBER: ${{ github.event.workflow_run.env.EVENT_NUMBER }}
+    PR_SHA: ${{ github.event.workflow_run.env.PR_SHA }}
+
+jobs:
+  prepare:
+    runs-on: [ self-hosted, Linux, regression_testing ]      
+    steps: 
+      - uses: actions/checkout@v6
+        with: 
+            sparse-checkout: './.CI/ReSim'
+
+      - name: Checkout code in docker
+        run: ./.CI/ReSim/prepare_pr.sh ${{ env.EVENT_NUMBER }}
+    
+  testrun_modelica:
+    needs: prepare
+    runs-on: [ self-hosted, Linux, regression_testing ]
+    environment: 
+        name: Report modelica
+        url: ${{ env.PR_SERVER }}/${{ env.EVENT_NUMBER }}/Modelica/report/PR_comparison_report.html
+    steps:         
+      - name: print envs
+        run: echo "TESTING_TOOLS=$TESTING_TOOLS"
+        env:
+            TESTING_TOOLS: ${{ vars.LTX_TESTING_TOOLS }}
+      - name: Run tests modelica      
+        run: ./.CI/ReSim/run_pr.sh ${{ env.EVENT_NUMBER }} ${{ env.PR_SHA }} Modelica ${{ env.TESTING_TOOLS }}
+
+            
+  testrun_modelicatest:
+    needs: prepare
+    runs-on: [ self-hosted, Linux, regression_testing ]
+    environment: 
+        name: Report modelicatest
+        url: ${{ env.PR_SERVER }}/${{ env.EVENT_NUMBER }}/ModelicaTest/report/PR_comparison_report.html
+    steps:    
+      - name: Run tests modelicatest      
+        run:  ./.CI/ReSim/run_pr.sh ${{ env.EVENT_NUMBER }} ${{ env.PR_SHA }} ModelicaTest ${{ env.TESTING_TOOLS }}