From 291195b11fcde8a0de3eeb942f19aa9e4ad66da6 Mon Sep 17 00:00:00 2001 From: David Laseca Perez Date: Tue, 8 Sep 2026 16:20:39 +0200 Subject: [PATCH] Fix weekly CI (#58) Signed-off-by: David Laseca Perez (cherry picked from commit d7b5088edbe9c14e1aa7701b2a723d0c64c62f19) --- .github/workflows/humble-ci.yml | 1 - .github/workflows/jazzy-ci.yml | 1 - .github/workflows/kilted-ci.yml | 1 - .github/workflows/lyrical-ci.yml | 1 - .github/workflows/reusable-ci.yml | 16 +++++++--------- .github/workflows/rolling-ci.yml | 1 - 6 files changed, 7 insertions(+), 14 deletions(-) diff --git a/.github/workflows/humble-ci.yml b/.github/workflows/humble-ci.yml index 53a458c9..d7e7b4a9 100644 --- a/.github/workflows/humble-ci.yml +++ b/.github/workflows/humble-ci.yml @@ -10,7 +10,6 @@ jobs: humble-ci: uses: ./.github/workflows/reusable-ci.yml with: - branch: ${{ github.ref }} os: ubuntu-22.04 docker-image: ubuntu:jammy ros-distribution: humble diff --git a/.github/workflows/jazzy-ci.yml b/.github/workflows/jazzy-ci.yml index 46af6759..434ca7df 100644 --- a/.github/workflows/jazzy-ci.yml +++ b/.github/workflows/jazzy-ci.yml @@ -10,7 +10,6 @@ jobs: jazzy-ci: uses: ./.github/workflows/reusable-ci.yml with: - branch: ${{ github.ref }} os: ubuntu-24.04 docker-image: ubuntu:noble ros-distribution: jazzy diff --git a/.github/workflows/kilted-ci.yml b/.github/workflows/kilted-ci.yml index 1523d5ab..ba8f9b36 100644 --- a/.github/workflows/kilted-ci.yml +++ b/.github/workflows/kilted-ci.yml @@ -10,7 +10,6 @@ jobs: kilted-ci: uses: ./.github/workflows/reusable-ci.yml with: - branch: ${{ github.ref }} os: ubuntu-24.04 docker-image: ubuntu:noble ros-distribution: kilted diff --git a/.github/workflows/lyrical-ci.yml b/.github/workflows/lyrical-ci.yml index 17c074f0..747d20c4 100644 --- a/.github/workflows/lyrical-ci.yml +++ b/.github/workflows/lyrical-ci.yml @@ -10,7 +10,6 @@ jobs: lyrical-ci: uses: ./.github/workflows/reusable-ci.yml with: - branch: ${{ github.ref }} os: ubuntu-26.04 docker-image: ubuntu:resolute ros-distribution: lyrical diff --git a/.github/workflows/reusable-ci.yml b/.github/workflows/reusable-ci.yml index 98977e55..c0106712 100644 --- a/.github/workflows/reusable-ci.yml +++ b/.github/workflows/reusable-ci.yml @@ -4,8 +4,9 @@ on: workflow_call: inputs: branch: - description: "The rcutils branch to use for the workflow" - required: true + description: "The rcutils branch to build. Leave unset for push and pull_request." + required: false + default: "" type: string os: description: "The OS to use for the workflow" @@ -33,13 +34,7 @@ jobs: apt-get update && apt-get install -y git shell: bash - - name: Sync repository - uses: actions/checkout@v5 - with: - ref: ${{ inputs.branch }} - submodules: recursive - - - name: Setup ROS 2 + - name: Setup ROS 2 uses: ros-tooling/setup-ros@0.7.19 with: required-ros-distributions: ${{ inputs.ros-distribution }} @@ -49,8 +44,11 @@ jobs: apt-get install ros-${{ inputs.ros-distribution }}-mimick-vendor apt-get -y install ros-${{ inputs.ros-distribution }}-performance-test-fixture + # This action clones the repository itself, so no checkout step is needed. + # When ref is empty it uses the branch that triggered the run. - uses : ros-tooling/action-ros-ci@0.4.8 with: package-name: "rcutils" target-ros2-distro: ${{ inputs.ros-distribution }} + ref: ${{ inputs.branch }} skip-tests: true diff --git a/.github/workflows/rolling-ci.yml b/.github/workflows/rolling-ci.yml index 2bd01d91..aef23e0a 100644 --- a/.github/workflows/rolling-ci.yml +++ b/.github/workflows/rolling-ci.yml @@ -10,7 +10,6 @@ jobs: rolling-ci: uses: ./.github/workflows/reusable-ci.yml with: - branch: ${{ github.ref }} os: ubuntu-24.04 docker-image: ubuntu:noble ros-distribution: rolling