From 32172952219e7683e1fa198b7bb7502158371782 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Thu, 18 Apr 2024 21:55:27 +0000 Subject: [PATCH 1/4] Use revert_coverage_hack branch --- .github/workflows/ci-coverage-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-coverage-build.yml b/.github/workflows/ci-coverage-build.yml index fac54d19..463801e5 100644 --- a/.github/workflows/ci-coverage-build.yml +++ b/.github/workflows/ci-coverage-build.yml @@ -11,7 +11,7 @@ on: jobs: coverage: name: coverage build - 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@revert_coverage_hack secrets: inherit with: ros_distro: rolling From 3c05b9ff3d47a25b3d7c78212a095a7bcc26196c Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 23 Apr 2024 20:36:10 +0000 Subject: [PATCH 2/4] Test the new workflows --- .github/workflows/ci-coverage-build.yml | 4 ++-- .github/workflows/ci-pre-commit.yml | 10 ++++++++-- .github/workflows/source-build.yml | 21 ++++++++++++++++++--- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-coverage-build.yml b/.github/workflows/ci-coverage-build.yml index 463801e5..2aa8606c 100644 --- a/.github/workflows/ci-coverage-build.yml +++ b/.github/workflows/ci-coverage-build.yml @@ -11,8 +11,8 @@ on: jobs: coverage: name: coverage build - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@revert_coverage_hack + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@master secrets: inherit with: ros_distro: rolling - os_name: ubuntu-22.04 + container: ubuntu:24.04 diff --git a/.github/workflows/ci-pre-commit.yml b/.github/workflows/ci-pre-commit.yml index b0f523d6..500af4d9 100644 --- a/.github/workflows/ci-pre-commit.yml +++ b/.github/workflows/ci-pre-commit.yml @@ -8,11 +8,17 @@ on: jobs: pre-commit: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@revert_coverage_hack strategy: fail-fast: false matrix: - ROS_DISTRO: [rolling, iron, humble] + ROS_DISTRO: [iron, humble] with: ros_distro: ${{ matrix.ROS_DISTRO }} os_name: ubuntu-22.04 + + pre-commit-rolling: + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@revert_coverage_hack + with: + ros_distro: rolling + container: ubuntu:24.04 diff --git a/.github/workflows/source-build.yml b/.github/workflows/source-build.yml index d228992a..9c58f18b 100644 --- a/.github/workflows/source-build.yml +++ b/.github/workflows/source-build.yml @@ -4,18 +4,33 @@ on: push: branches: - master + pull_request: + branches: + - master schedule: # Run every day to detect flakiness and broken dependencies - cron: '03 3 * * *' jobs: - source: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@master + # source: + # uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@master + # strategy: + # fail-fast: false + # matrix: + # ROS_DISTRO: [iron, humble] + # with: + # ros_distro: ${{ matrix.ROS_DISTRO }} + # ref: master + # ros2_repo_branch: ${{ matrix.ROS_DISTRO }} + # os_name: ubuntu-22.04 + source-rolling: + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@revert_coverage_hack strategy: fail-fast: false matrix: - ROS_DISTRO: [rolling, iron, humble] + ROS_DISTRO: [rolling] with: ros_distro: ${{ matrix.ROS_DISTRO }} ref: master ros2_repo_branch: ${{ matrix.ROS_DISTRO }} + container: ubuntu:24.04 From 8c6517ac2dd5de5052e80ac7b629f1e8ac8c91b4 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 23 Apr 2024 20:40:48 +0000 Subject: [PATCH 3/4] Use test branch --- .github/workflows/ci-coverage-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-coverage-build.yml b/.github/workflows/ci-coverage-build.yml index 2aa8606c..9c9aef3a 100644 --- a/.github/workflows/ci-coverage-build.yml +++ b/.github/workflows/ci-coverage-build.yml @@ -11,7 +11,7 @@ on: jobs: coverage: name: coverage build - 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@revert_coverage_hack secrets: inherit with: ros_distro: rolling From 1c04b934d319866c0d80e8d770b512a744880017 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Wed, 24 Apr 2024 13:26:22 +0000 Subject: [PATCH 4/4] Switch back to master branch --- .github/workflows/ci-coverage-build.yml | 2 +- .github/workflows/ci-pre-commit.yml | 4 ++-- .github/workflows/source-build.yml | 27 +++++++++++-------------- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci-coverage-build.yml b/.github/workflows/ci-coverage-build.yml index 9c9aef3a..2aa8606c 100644 --- a/.github/workflows/ci-coverage-build.yml +++ b/.github/workflows/ci-coverage-build.yml @@ -11,7 +11,7 @@ on: jobs: coverage: name: coverage build - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@revert_coverage_hack + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@master secrets: inherit with: ros_distro: rolling diff --git a/.github/workflows/ci-pre-commit.yml b/.github/workflows/ci-pre-commit.yml index 500af4d9..adb6694b 100644 --- a/.github/workflows/ci-pre-commit.yml +++ b/.github/workflows/ci-pre-commit.yml @@ -8,7 +8,7 @@ on: jobs: pre-commit: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@revert_coverage_hack + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master strategy: fail-fast: false matrix: @@ -18,7 +18,7 @@ jobs: os_name: ubuntu-22.04 pre-commit-rolling: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@revert_coverage_hack + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master with: ros_distro: rolling container: ubuntu:24.04 diff --git a/.github/workflows/source-build.yml b/.github/workflows/source-build.yml index 9c58f18b..0ec32c79 100644 --- a/.github/workflows/source-build.yml +++ b/.github/workflows/source-build.yml @@ -4,27 +4,24 @@ on: push: branches: - master - pull_request: - branches: - - master schedule: # Run every day to detect flakiness and broken dependencies - cron: '03 3 * * *' jobs: - # source: - # uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@master - # strategy: - # fail-fast: false - # matrix: - # ROS_DISTRO: [iron, humble] - # with: - # ros_distro: ${{ matrix.ROS_DISTRO }} - # ref: master - # ros2_repo_branch: ${{ matrix.ROS_DISTRO }} - # os_name: ubuntu-22.04 + source: + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@master + strategy: + fail-fast: false + matrix: + ROS_DISTRO: [iron, humble] + with: + ros_distro: ${{ matrix.ROS_DISTRO }} + ref: master + ros2_repo_branch: ${{ matrix.ROS_DISTRO }} + os_name: ubuntu-22.04 source-rolling: - uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@revert_coverage_hack + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@master strategy: fail-fast: false matrix: