Remove omg interoperability (#486)

* do not Remove DustDDS

* do not use own build

* add path

* remove source code

* change manifest-path

* add Cargo.toml

* fix path

* checkout shape.idl

* remove sparse chackout

* add ls dir

* fix Remove DustDDS

* fix upload path

* add config patch

* zipBall false

* Remove zip files

* use unzip

* zip exe

* use same dds-rtps for report making

* use 'v2.0.2025'

* fix version

* download exes from omg

* add working-directory

* use sed for version

Author: stkimmer

.github/workflows/interoperability.yml

@@ -10,23 +10,30 @@ jobs:
     steps:
     - name: Checkout sources
       uses: actions/checkout@v4
-
-    - run: cargo build --package dust_dds_shape_main_linux --release
-    - name: Install tomlq
-      run: cargo install tomlq
-    - name: Install zip
-      run: sudo apt-get install zip -y
-    - name: Rename executable
+      with:
+        path: dust-dds
+    - name: Checkout omg dds-rtps from s2e-systems fork
+      uses: actions/checkout@v4
+      with:
+        repository: s2e-systems/dds-rtps
+        ref: update-dust-dds-src
+        path: dds-rtps
+    - name: Build executable
+      run: cargo build --package dust_dds_shape_main_linux --release --manifest-path dds-rtps/srcRs/DustDDS/Cargo.toml --config patch.crates-io.dust_dds.path="'dust-dds/dds'"
+    - name: Zip executable  # Zipping done here to preserve executable bit
       run: |
-        version=$( tq -f dds/Cargo.toml 'package.version' | tr -d '"' )
-        cp ./target/release/dust_dds_shape_main_linux ./dust_dds-${version}_shape_main_linux
-        mkdir artifacts
-        zip --junk-paths artifacts/dust_dds-${version}_shape_main_linux.zip ./dust_dds-${version}_shape_main_linux
+        version=$( cargo tree --package dust_dds --depth 0 --prefix none | sed -n 's/.*v\([0-9.]*\).*/\1/p' )
+        echo $version
+        cp ../dds-rtps/srcRs/DustDDS/target/release/dust_dds_shape_main_linux dust_dds-${version}_shape_main_linux
+        mkdir ../artifacts
+        zip --junk-paths ../artifacts/dust_dds-${version}_shape_main_linux.zip dust_dds-${version}_shape_main_linux
+      working-directory:
+        dust-dds
     - name: Upload executable artifact
       uses: actions/upload-artifact@v4
       with:
         name: interoperability_executable
-        path: ./artifacts/
+        path: artifacts
 
   run_tests:
     runs-on: ubuntu-latest
@@ -61,19 +68,12 @@ jobs:
     steps:
     - name: Checkout sources
       uses: actions/checkout@v4
-    - name: Checkout dds-rtps
+    - name: Checkout omg dds-rtps
       uses: actions/checkout@v4
       with:
-        repository: omg-dds/dds-rtps
-        ref: 'v2.0.2025'
+        repository: s2e-systems/dds-rtps
+        ref: update-dust-dds-src
         path: omg-dds-rtps
-        sparse-checkout-cone-mode: false
-        sparse-checkout: |
-          interoperability_report.py
-          test_suite.py
-          rtps_test_utilities.py
-          test_suite_functions.py
-          requirements.txt
     - uses: actions/setup-python@v5
       with:
         python-version: '3.11.4'
@@ -84,22 +84,25 @@ jobs:
         latest: true
         preRelease: false
         fileName: "*"
+        out-file-path: zipped_executables
     - name: Remove DustDDS
-      run: rm dust_dds-*
+      run: rm zipped_executables/dust_dds*
+      continue-on-error: true
     - name: Download dust_dds_shape_main executable artifact from create_bin_release
       uses: actions/download-artifact@v4
       with:
         name: interoperability_executable
+        path: zipped_executables
     - name: Unzip executables
-      run: unzip '*.zip' -d executables
+      run: unzip 'zipped_executables/*.zip' -d executables
     - name: List directory
-      run: ls -l
+      run: ls -l executables
     - name: Install omg-dds dds-rtps Python requirements
       run: pip install --requirement omg-dds-rtps/requirements.txt
 
     - name: Run Interoperability script
-      timeout-minutes: 60
-      run: python3 ./omg-dds-rtps/interoperability_report.py --verbose --publisher ./executables/${{ matrix.publisher }}-*shape_main_linux --subscriber ./executables/${{ matrix.subscriber }}-*shape_main_linux --output-name junit_report-${{ matrix.publisher }}-${{ matrix.subscriber }}.xml
+      timeout-minutes: 30
+      run: python3 ./omg-dds-rtps/interoperability_report.py --verbose --publisher ./executables/${{ matrix.publisher }}*shape_main_linux --subscriber ./executables/${{ matrix.subscriber }}*shape_main_linux --output-name junit_report-${{ matrix.publisher }}-${{ matrix.subscriber }}.xml
 
     - name: Upload report
       uses: actions/upload-artifact@v4
@@ -119,16 +122,9 @@ jobs:
     - name: Checkout omg-dds dds-rtps
       uses: actions/checkout@v4
       with:
-        repository: omg-dds/dds-rtps
-        ref: '9e1fdbcd30bc785e5e5113a94e5e936695a3385e'
+        repository: s2e-systems/dds-rtps
+        ref: update-dust-dds-src
         path: omg-dds-rtps
-        sparse-checkout-cone-mode: false
-        sparse-checkout: |
-          generate_xlsx_report.py
-          rtps_test_utilities.py
-          test_suite.py
-          test_suite_functions.py
-          requirements.txt
     - uses: actions/setup-python@v5
       with:
         python-version: '3.11.4'

Cargo.toml

@@ -8,7 +8,6 @@ members = [
     "shapes_demo/android",
     "fuzz",
     "bindings/python",
-    "omg_interoperability_executable",
     "nostd_test_project",
 ]
 default-members = [