From 648432f67040c4e37fd62a8f3f391ed026ee808b Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Fri, 1 Nov 2024 16:42:28 +0000 Subject: [PATCH 1/4] Test workflows --- .github/workflows/build-binary.yml | 2 +- .github/workflows/rosdoc2.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-binary.yml b/.github/workflows/build-binary.yml index c6df8877..8b88086e 100644 --- a/.github/workflows/build-binary.yml +++ b/.github/workflows/build-binary.yml @@ -14,7 +14,7 @@ on: jobs: binary: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@use_containers strategy: fail-fast: false matrix: diff --git a/.github/workflows/rosdoc2.yml b/.github/workflows/rosdoc2.yml index bed9cf9a..5f0f5f48 100644 --- a/.github/workflows/rosdoc2.yml +++ b/.github/workflows/rosdoc2.yml @@ -11,4 +11,4 @@ on: jobs: check: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-rosdoc2.yml@master + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-rosdoc2.yml@use_containers From 84c893912f7b0a9bd6fd74032ee4a0a6bd3ed9a4 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Fri, 1 Nov 2024 17:38:37 +0000 Subject: [PATCH 2/4] Test coverage wf --- .github/workflows/build-coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-coverage.yml b/.github/workflows/build-coverage.yml index 406a9295..81330a68 100644 --- a/.github/workflows/build-coverage.yml +++ b/.github/workflows/build-coverage.yml @@ -11,7 +11,7 @@ on: jobs: coverage_rolling: name: coverage build - rolling - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@master + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@use_containers secrets: inherit with: ros_distro: rolling From f2b7b89039d700fd3bbabc5bb39e6075a61e0bb5 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Fri, 1 Nov 2024 17:59:08 +0000 Subject: [PATCH 3/4] Use reusable wf for ABI --- .github/workflows/abi-compatibility.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/abi-compatibility.yml b/.github/workflows/abi-compatibility.yml index a5719664..2c48e99f 100644 --- a/.github/workflows/abi-compatibility.yml +++ b/.github/workflows/abi-compatibility.yml @@ -7,16 +7,10 @@ on: jobs: abi_check: - runs-on: ubuntu-latest + uses: ./../ros2_control_ci/.github/workflows/reusable-abi-check.yml strategy: fail-fast: false matrix: ROS_DISTRO: [rolling, jazzy, iron, humble] - steps: - - uses: actions/checkout@v4 - - uses: ros-industrial/industrial_ci@master - env: - ROS_DISTRO: ${{ matrix.ROS_DISTRO }} - ROS_REPO: main - ABICHECK_URL: github:${{ github.repository }}#${{ github.base_ref }} - NOT_TEST_BUILD: true + with: + ros_distro: ${{ matrix.ROS_DISTRO }} From a4d3af1a36c7c7f6e2be6eefb9e540e4f9aee590 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Fri, 1 Nov 2024 17:59:53 +0000 Subject: [PATCH 4/4] Use reusable wf for ABI --- .github/workflows/abi-compatibility.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/abi-compatibility.yml b/.github/workflows/abi-compatibility.yml index 2c48e99f..cd993aad 100644 --- a/.github/workflows/abi-compatibility.yml +++ b/.github/workflows/abi-compatibility.yml @@ -7,7 +7,7 @@ on: jobs: abi_check: - uses: ./../ros2_control_ci/.github/workflows/reusable-abi-check.yml + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-abi-check.yml@use_containers strategy: fail-fast: false matrix: