Skip to content

Commit aef182b

Browse files
ClemensLinnhoffClemensLinnhoff
authored
Update Pipeline (#24)
* Update Pipeline Signed-off-by: ClemensLinnhoff <Clemens.Linnhoff@partner.bmw.de> * Add BSL-1.0 License Signed-off-by: ClemensLinnhoff <Clemens.Linnhoff@partner.bmw.de> --------- Signed-off-by: ClemensLinnhoff <Clemens.Linnhoff@partner.bmw.de>
1 parent 6ae54a8 commit aef182b

File tree

6 files changed

+32
-32
lines changed

6 files changed

+32
-32
lines changed

‎.github/workflows/build_osi_field_checker.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,40 +36,40 @@ jobs:
3636
path: /tmp/osi-field-checker
3737
key: ${{ runner.os }}-osi-field-checker
3838

39-
- name: Clone OpenMSL Sensor Model Testing
39+
- name: Clone OpenMSL OSI Field Checker
4040
if: steps.cache-osi-field-checker.outputs.cache-hit != 'true'
41-
run: git clone https://github.com/openMSL/sl-1-5-sensor-model-testing.git
41+
run: git clone https://github.com/openMSL/sl-5-2-osi-field-checker.git
4242

4343
- name: Prepare C++ Build
4444
if: steps.cache-osi-field-checker.outputs.cache-hit != 'true'
45-
working-directory: sl-1-5-sensor-model-testing
45+
working-directory: sl-5-2-osi-field-checker
4646
run: git submodule update --init && mkdir build
4747

4848
- name: Configure CMake
4949
if: steps.cache-osi-field-checker.outputs.cache-hit != 'true'
50-
working-directory: sl-1-5-sensor-model-testing/build
50+
working-directory: sl-5-2-osi-field-checker/build
5151
run: cmake -DCMAKE_PREFIX_PATH:PATH=${DEPS_DIR}/protobuf/install ..
5252

5353
- name: Build C++
5454
if: steps.cache-osi-field-checker.outputs.cache-hit != 'true'
55-
working-directory: sl-1-5-sensor-model-testing/build
55+
working-directory: sl-5-2-osi-field-checker/build
5656
run: cmake --build . -j4
5757

5858
- name: Create FMU Directory
5959
if: steps.cache-osi-field-checker.outputs.cache-hit != 'true'
60-
working-directory: sl-1-5-sensor-model-testing/build
60+
working-directory: sl-5-2-osi-field-checker/build
6161
run: mkdir /tmp/osi-field-checker
6262

6363
- name: Copy Commit ID to Cache
6464
if: steps.cache-osi-field-checker.outputs.cache-hit != 'true'
65-
working-directory: sl-1-5-sensor-model-testing
65+
working-directory: sl-5-2-osi-field-checker
6666
run: |
6767
git rev-parse --short HEAD > commit-id.txt
6868
cp commit-id.txt /tmp/osi-field-checker/commit-id.txt
6969
7070
- name: Copy OSI Field Checker FMU
7171
if: steps.cache-osi-field-checker.outputs.cache-hit != 'true'
72-
working-directory: sl-1-5-sensor-model-testing/build
72+
working-directory: sl-5-2-osi-field-checker/build
7373
run: cp OSIFieldChecker.fmu /tmp/osi-field-checker/OSIFieldChecker.fmu
7474

7575
- name: Commit ID

‎.github/workflows/build_tracefile_player.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,38 +38,38 @@ jobs:
3838

3939
- name: Get Tracefile Player
4040
if: steps.cache-tracefile-player-fmu.outputs.cache-hit != 'true'
41-
run: git clone https://gitlab.com/persival-open-source/open-simulation-interface/osi-trace-file-player.git
41+
run: git clone https://github.com/openMSL/sl-5-5-osi-trace-file-player.git
4242

4343
- name: Prepare C++ Build
4444
if: steps.cache-tracefile-player-fmu.outputs.cache-hit != 'true'
45-
working-directory: osi-trace-file-player
45+
working-directory: sl-5-5-osi-trace-file-player
4646
run: git submodule update --init && mkdir build
4747

4848
- name: Configure CMake
4949
if: steps.cache-tracefile-player-fmu.outputs.cache-hit != 'true'
50-
working-directory: osi-trace-file-player/build
50+
working-directory: sl-5-5-osi-trace-file-player/build
5151
run: cmake -DCMAKE_PREFIX_PATH:PATH=${DEPS_DIR}/protobuf/install ..
5252

5353
- name: Build C++
5454
if: steps.cache-tracefile-player-fmu.outputs.cache-hit != 'true'
55-
working-directory: osi-trace-file-player/build
55+
working-directory: sl-5-5-osi-trace-file-player/build
5656
run: cmake --build .
5757

5858
- name: Create FMU Directory
5959
if: steps.cache-tracefile-player-fmu.outputs.cache-hit != 'true'
60-
working-directory: osi-trace-file-player/build
60+
working-directory: sl-5-5-osi-trace-file-player/build
6161
run: mkdir /tmp/tracefile_player_fmu
6262

6363
- name: Copy Commit ID to Cache
6464
if: steps.cache-tracefile-player-fmu.outputs.cache-hit != 'true'
65-
working-directory: osi-trace-file-player
65+
working-directory: sl-5-5-osi-trace-file-player
6666
run: |
6767
git rev-parse --short HEAD > commit-id.txt
6868
cp commit-id.txt /tmp/tracefile_player_fmu/commit-id.txt
6969
7070
- name: Copy Tracefile FMU
7171
if: steps.cache-tracefile-player-fmu.outputs.cache-hit != 'true'
72-
working-directory: osi-trace-file-player/build
72+
working-directory: sl-5-5-osi-trace-file-player/build
7373
run: cp src/OSMPTraceFilePlayer.fmu /tmp/tracefile_player_fmu/OSMPTraceFilePlayer.fmu
7474

7575
- name: Commit ID

‎.github/workflows/build_tracefile_writer.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,21 @@ jobs:
3838

3939
- name: Get Tracefile Player
4040
if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true'
41-
run: git clone https://github.com/Persival-GmbH/osi-sensordata-trace-file-writer.git
41+
run: git clone https://github.com/openMSL/sl-5-6-osi-trace-file-writer.git
4242

4343
- name: Prepare C++ Build
4444
if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true'
45-
working-directory: osi-sensordata-trace-file-writer
45+
working-directory: sl-5-6-osi-trace-file-writer
4646
run: git submodule update --init && mkdir build
4747

4848
- name: Configure CMake
4949
if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true'
50-
working-directory: osi-sensordata-trace-file-writer/build
50+
working-directory: sl-5-6-osi-trace-file-writer/build
5151
run: cmake -DCMAKE_PREFIX_PATH:PATH=${DEPS_DIR}/protobuf/install ..
5252

5353
- name: Build C++
5454
if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true'
55-
working-directory: osi-sensordata-trace-file-writer/build
55+
working-directory: sl-5-6-osi-trace-file-writer/build
5656
run: cmake --build .
5757

5858
- name: Create FMU Directory
@@ -61,15 +61,15 @@ jobs:
6161

6262
- name: Copy Commit ID to Cache
6363
if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true'
64-
working-directory: osi-sensordata-trace-file-writer
64+
working-directory: sl-5-6-osi-trace-file-writer
6565
run: |
6666
git rev-parse --short HEAD > commit-id.txt
6767
cp commit-id.txt /tmp/tracefile_writer_fmu/commit-id.txt
6868
6969
- name: Copy Tracefile Writer FMU
7070
if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true'
71-
working-directory: osi-sensordata-trace-file-writer/build
72-
run: cp osi-sensordata-trace-file-writer.fmu /tmp/tracefile_writer_fmu/osi-sensordata-trace-file-writer.fmu
71+
working-directory: sl-5-6-osi-trace-file-writer/build
72+
run: cp osi-trace-file-writer.fmu /tmp/tracefile_writer_fmu/osi-trace-file-writer.fmu
7373

7474
- name: Commit ID
7575
working-directory: /tmp/tracefile_writer_fmu

‎.github/workflows/cl0.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ jobs:
1212
uses: actions/checkout@v3
1313
- uses: enarx/spdx@master
1414
with:
15-
licenses: Apache-2.0 BSD-3-Clause BSD-2-Clause BSL-1.0 GPL-2.0 GPL-3.0 LGPL-2.0 LGPL-2.1 LGPL-3.0 MIT MPL-2.0 CDDL-1.0 EPL-2.0
15+
licenses: Apache-2.0 BSD-3-Clause BSD-2-Clause BSL-1.0 MIT MPL-2.0

‎.github/workflows/srmd-validator.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@ jobs:
1111
- name: Checkout
1212
uses: actions/checkout@master
1313

14-
- name: Get Sensor Model Testing
15-
run: git clone https://github.com/openMSL/sl-1-5-sensor-model-testing.git
14+
- name: Get SRMD Validator
15+
run: git clone https://github.com/openMSL/sl-5-1-srmd-validator.git
1616

1717
- name: Init Submodules
18-
working-directory: sl-1-5-sensor-model-testing
18+
working-directory: sl-5-1-srmd-validator
1919
run: git submodule update --init --recursive
2020

2121
- name: Install Dependencies
2222
run: pip3 install xmlschema
2323

2424
- name: Validate SRMD
25-
working-directory: sl-1-5-sensor-model-testing/src/srmd-validator
25+
working-directory: sl-5-1-srmd-validator
2626
run: python3 srmd-validator.py
2727

2828
- name: Commit ID
29-
working-directory: sl-1-5-sensor-model-testing
29+
working-directory: sl-5-1-srmd-validator
3030
run: |
3131
echo "Commit ID: "
3232
echo $(git rev-parse --short HEAD)

‎test/integration/003_regression_test_7/SystemStructure.ssd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
</ssd:ParameterBinding>
8080
</ssd:ParameterBindings>
8181
</ssd:Component>
82-
<ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_writer_fmu/osi-sensordata-trace-file-writer.fmu" implementation="CoSimulation" name="osi-sensordata-trace-file-writer" description="Write binary OSI SensorData trace files">
82+
<ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_writer_fmu/osi-trace-file-writer.fmu" implementation="CoSimulation" name="osi-trace-file-writer" description="Write binary OSI SensorData trace files">
8383
<ssd:Connectors>
8484
<ssd:Connector name="OSMPSensorDataIn.size" kind="input">
8585
<ssc:Integer/>
@@ -120,9 +120,9 @@
120120
<ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
121121
<ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
122122
<ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
123-
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.hi" endElement="osi-sensordata-trace-file-writer" endConnector="OSMPSensorDataIn.base.hi" suppressUnitConversion="false"/>
124-
<ssd:Connection startElement="osi-sensordata-trace-file-writer" startConnector="OSMPSensorDataIn.base.lo" endElement="SensorModel" endConnector="OSMPSensorDataOut.base.lo" suppressUnitConversion="false"/>
125-
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.size" endElement="osi-sensordata-trace-file-writer" endConnector="OSMPSensorDataIn.size" suppressUnitConversion="false"/>
123+
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.hi" endElement="osi-trace-file-writer" endConnector="OSMPSensorDataIn.base.hi" suppressUnitConversion="false"/>
124+
<ssd:Connection startElement="osi-trace-file-writer" startConnector="OSMPSensorDataIn.base.lo" endElement="SensorModel" endConnector="OSMPSensorDataOut.base.lo" suppressUnitConversion="false"/>
125+
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.size" endElement="osi-trace-file-writer" endConnector="OSMPSensorDataIn.size" suppressUnitConversion="false"/>
126126
</ssd:Connections>
127127
<ssd:SystemGeometry x1="-619.0" y1="-666.5" x2="1849.5" y2="126.5"/>
128128
</ssd:System>

0 commit comments

Comments
 (0)