From 769d75305cf8d608111f24c7528d987ac1e50911 Mon Sep 17 00:00:00 2001 From: ClemensLinnhoff Date: Mon, 30 Sep 2024 17:36:55 +0200 Subject: [PATCH 1/2] Rename trace file writer and trace file player Signed-off-by: ClemensLinnhoff --- .github/workflows/build_tracefile_player.yml | 2 +- .github/workflows/build_tracefile_writer.yml | 12 ++++++------ test/integration/001_smoke_test/SystemStructure.ssd | 8 ++++---- .../002_output_osi_fields/SystemStructure.ssd | 8 ++++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build_tracefile_player.yml b/.github/workflows/build_tracefile_player.yml index b07a6c7..cadc737 100644 --- a/.github/workflows/build_tracefile_player.yml +++ b/.github/workflows/build_tracefile_player.yml @@ -70,7 +70,7 @@ jobs: - name: Copy Tracefile FMU if: steps.cache-tracefile-player-fmu.outputs.cache-hit != 'true' working-directory: sl-5-5-osi-trace-file-player/build - run: cp OSMPTraceFilePlayer.fmu /tmp/tracefile_player_fmu/OSMPTraceFilePlayer.fmu + run: cp sl-5-5-osi-trace-file-player.fmu /tmp/tracefile_player_fmu/sl-5-5-osi-trace-file-player.fmu - name: Commit ID working-directory: /tmp/tracefile_player_fmu diff --git a/.github/workflows/build_tracefile_writer.yml b/.github/workflows/build_tracefile_writer.yml index ea64ddd..c18c15f 100644 --- a/.github/workflows/build_tracefile_writer.yml +++ b/.github/workflows/build_tracefile_writer.yml @@ -42,17 +42,17 @@ jobs: - name: Prepare C++ Build if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true' - working-directory: sl-5-6-osi-trace-file-writer + working-directory: sl-5-6-sl-5-6-osi-trace-file-writer run: git submodule update --init && mkdir build - name: Configure CMake if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true' - working-directory: sl-5-6-osi-trace-file-writer/build + working-directory: sl-5-6-sl-5-6-osi-trace-file-writer/build run: cmake -DCMAKE_PREFIX_PATH:PATH=${DEPS_DIR}/protobuf/install .. - name: Build C++ if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true' - working-directory: sl-5-6-osi-trace-file-writer/build + working-directory: sl-5-6-sl-5-6-osi-trace-file-writer/build run: cmake --build . - name: Create FMU Directory @@ -61,15 +61,15 @@ jobs: - name: Copy Commit ID to Cache if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true' - working-directory: sl-5-6-osi-trace-file-writer + working-directory: sl-5-6-sl-5-6-osi-trace-file-writer run: | git rev-parse --short HEAD > commit-id.txt cp commit-id.txt /tmp/tracefile_writer_fmu/commit-id.txt - name: Copy Tracefile Writer FMU if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true' - working-directory: sl-5-6-osi-trace-file-writer/build - run: cp osi-trace-file-writer.fmu /tmp/tracefile_writer_fmu/osi-trace-file-writer.fmu + working-directory: sl-5-6-sl-5-6-osi-trace-file-writer/build + run: cp sl-5-6-osi-trace-file-writer.fmu /tmp/tracefile_writer_fmu/sl-5-6-osi-trace-file-writer.fmu - name: Commit ID working-directory: /tmp/tracefile_writer_fmu diff --git a/test/integration/001_smoke_test/SystemStructure.ssd b/test/integration/001_smoke_test/SystemStructure.ssd index 020ccb5..9344c65 100644 --- a/test/integration/001_smoke_test/SystemStructure.ssd +++ b/test/integration/001_smoke_test/SystemStructure.ssd @@ -11,7 +11,7 @@ - + @@ -81,9 +81,9 @@ - - - + + + diff --git a/test/integration/002_output_osi_fields/SystemStructure.ssd b/test/integration/002_output_osi_fields/SystemStructure.ssd index 73c0213..19422a3 100644 --- a/test/integration/002_output_osi_fields/SystemStructure.ssd +++ b/test/integration/002_output_osi_fields/SystemStructure.ssd @@ -11,7 +11,7 @@ - + @@ -123,9 +123,9 @@ - - - + + + From d14bde8cf0857240d2f22023fa004f5087d22ede Mon Sep 17 00:00:00 2001 From: ClemensLinnhoff Date: Mon, 30 Sep 2024 17:56:35 +0200 Subject: [PATCH 2/2] Fix working directory Signed-off-by: ClemensLinnhoff --- .github/workflows/build_tracefile_writer.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_tracefile_writer.yml b/.github/workflows/build_tracefile_writer.yml index c18c15f..63c3417 100644 --- a/.github/workflows/build_tracefile_writer.yml +++ b/.github/workflows/build_tracefile_writer.yml @@ -42,17 +42,17 @@ jobs: - name: Prepare C++ Build if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true' - working-directory: sl-5-6-sl-5-6-osi-trace-file-writer + working-directory: sl-5-6-osi-trace-file-writer run: git submodule update --init && mkdir build - name: Configure CMake if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true' - working-directory: sl-5-6-sl-5-6-osi-trace-file-writer/build + working-directory: sl-5-6-osi-trace-file-writer/build run: cmake -DCMAKE_PREFIX_PATH:PATH=${DEPS_DIR}/protobuf/install .. - name: Build C++ if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true' - working-directory: sl-5-6-sl-5-6-osi-trace-file-writer/build + working-directory: sl-5-6-osi-trace-file-writer/build run: cmake --build . - name: Create FMU Directory @@ -61,14 +61,14 @@ jobs: - name: Copy Commit ID to Cache if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true' - working-directory: sl-5-6-sl-5-6-osi-trace-file-writer + working-directory: sl-5-6-osi-trace-file-writer run: | git rev-parse --short HEAD > commit-id.txt cp commit-id.txt /tmp/tracefile_writer_fmu/commit-id.txt - name: Copy Tracefile Writer FMU if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true' - working-directory: sl-5-6-sl-5-6-osi-trace-file-writer/build + working-directory: sl-5-6-osi-trace-file-writer/build run: cp sl-5-6-osi-trace-file-writer.fmu /tmp/tracefile_writer_fmu/sl-5-6-osi-trace-file-writer.fmu - name: Commit ID