From e4f9c1de367a5610b625a4caa8ace4d2e34cf564 Mon Sep 17 00:00:00 2001 From: Timothy Simpson Date: Thu, 11 Jun 2026 10:27:18 +0100 Subject: [PATCH 1/3] workflow updates for zzdds --- .github/workflows/1_run_interoperability_tests.yml | 4 ++-- .github/workflows/ci_zzdds.yml | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/1_run_interoperability_tests.yml b/.github/workflows/1_run_interoperability_tests.yml index eb3a7e9..55df5d8 100644 --- a/.github/workflows/1_run_interoperability_tests.yml +++ b/.github/workflows/1_run_interoperability_tests.yml @@ -6,11 +6,11 @@ on: publishers: description: Publishers to use type: string - default: '["connext_dds","dust_dds","eprosima_fastdds","intercom_dds","opendds","toc_coredx_dds", "hdds", "eclipse_cyclone"]' + default: '["connext_dds","dust_dds","eprosima_fastdds","intercom_dds","opendds","toc_coredx_dds", "hdds", "eclipse_cyclone", "zzdds"]' subscribers: description: Subscribers to use type: string - default: '["connext_dds","dust_dds","eprosima_fastdds","intercom_dds","opendds","toc_coredx_dds", "hdds", "eclipse_cyclone"]' + default: '["connext_dds","dust_dds","eprosima_fastdds","intercom_dds","opendds","toc_coredx_dds", "hdds", "eclipse_cyclone", "zzdds"]' jobs: generate_timestamp: runs-on: ubuntu-latest diff --git a/.github/workflows/ci_zzdds.yml b/.github/workflows/ci_zzdds.yml index d51174a..283fa79 100644 --- a/.github/workflows/ci_zzdds.yml +++ b/.github/workflows/ci_zzdds.yml @@ -16,7 +16,7 @@ concurrency: jobs: build: name: Build shape_main - runs-on: ubuntu-24.04 + runs-on: ubuntu-22.04 steps: - name: Checkout dds-rtps @@ -29,4 +29,14 @@ jobs: - name: Build shape_main working-directory: srcZig/zzdds - run: zig build -Dtarget=x86_64-linux-gnu -Doptimize=ReleaseSafe + run: | + ZZDDS_VERSION=$( grep "zzdds-" build.zig.zon | cut -d '-' -f 2 ) + echo "ZZDDS_VERSION=${ZZDDS_VERSION}" >> $GITHUB_ENV + zig build -Dtarget=x86_64-linux-gnu -Doptimize=ReleaseSafe + cp ./zig-out/bin/zzdds_shape_main_linux zzdds-${ZZDDS_VERSION}-shape_main_linux + + - name: Upload executable artifact + uses: actions/upload-artifact@v4 + with: + name: zzdds-${{ env.ZZDDS_VERSION }}-shape_main_linux + path: srcZig/zzdds/zzdds-${{ env.ZZDDS_VERSION }}-shape_main_linux From 8fb509f7a06ffb36dfe8fb2907257db34ddcdca9 Mon Sep 17 00:00:00 2001 From: Timothy Simpson Date: Tue, 16 Jun 2026 17:15:46 +0100 Subject: [PATCH 2/3] Apply suggestion from @sqt --- .github/workflows/ci_zzdds.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_zzdds.yml b/.github/workflows/ci_zzdds.yml index 283fa79..43dd5b7 100644 --- a/.github/workflows/ci_zzdds.yml +++ b/.github/workflows/ci_zzdds.yml @@ -38,5 +38,5 @@ jobs: - name: Upload executable artifact uses: actions/upload-artifact@v4 with: - name: zzdds-${{ env.ZZDDS_VERSION }}-shape_main_linux + name: zzdds-${{ env.ZZDDS_VERSION }}_shape_main_linux path: srcZig/zzdds/zzdds-${{ env.ZZDDS_VERSION }}-shape_main_linux From 8217f64aefa945366404198ae7536c1277e50109 Mon Sep 17 00:00:00 2001 From: Timothy Simpson Date: Tue, 16 Jun 2026 17:17:37 +0100 Subject: [PATCH 3/3] Apply suggestion from @sqt --- .github/workflows/ci_zzdds.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_zzdds.yml b/.github/workflows/ci_zzdds.yml index 43dd5b7..787aebc 100644 --- a/.github/workflows/ci_zzdds.yml +++ b/.github/workflows/ci_zzdds.yml @@ -33,10 +33,10 @@ jobs: ZZDDS_VERSION=$( grep "zzdds-" build.zig.zon | cut -d '-' -f 2 ) echo "ZZDDS_VERSION=${ZZDDS_VERSION}" >> $GITHUB_ENV zig build -Dtarget=x86_64-linux-gnu -Doptimize=ReleaseSafe - cp ./zig-out/bin/zzdds_shape_main_linux zzdds-${ZZDDS_VERSION}-shape_main_linux + cp ./zig-out/bin/zzdds_shape_main_linux zzdds-${ZZDDS_VERSION}_shape_main_linux - name: Upload executable artifact uses: actions/upload-artifact@v4 with: name: zzdds-${{ env.ZZDDS_VERSION }}_shape_main_linux - path: srcZig/zzdds/zzdds-${{ env.ZZDDS_VERSION }}-shape_main_linux + path: srcZig/zzdds/zzdds-${{ env.ZZDDS_VERSION }}_shape_main_linux