From 8d01903d566503c4537284faf80e907db98a0cae Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 27 Feb 2024 19:21:52 +0000 Subject: [PATCH 1/7] Test not to give a path for checkout --- .github/workflows/reusable-build-coverage.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/reusable-build-coverage.yml b/.github/workflows/reusable-build-coverage.yml index 72da69e..724270f 100644 --- a/.github/workflows/reusable-build-coverage.yml +++ b/.github/workflows/reusable-build-coverage.yml @@ -25,12 +25,10 @@ jobs: with: required-ros-distributions: ${{ inputs.ros_distro }} - uses: actions/checkout@v4 - with: - path: ${{ env.path }} - id: package_list_action uses: ros-controls/ros2_control_ci/.github/actions/set-package-list@master with: - path: ${{ env.path }} + path: src - uses: ros-tooling/action-ros-ci@0.3.6 with: target-ros2-distro: ${{ inputs.ros_distro }} From 01cb3758d77e3f95ea8de9620892c4d1366bdc6f Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 27 Feb 2024 19:59:36 +0000 Subject: [PATCH 2/7] debug output --- .github/actions/set-package-list/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/set-package-list/action.yml b/.github/actions/set-package-list/action.yml index 6f5f58b..80e6efd 100644 --- a/.github/actions/set-package-list/action.yml +++ b/.github/actions/set-package-list/action.yml @@ -19,6 +19,7 @@ runs: steps: - id: colcon run: | + ls ${{ inputs.path }} echo "package_list=$(colcon list --paths ${{ inputs.path }} --names-only | tr '\n' ' ') $(colcon list --paths ${{ inputs.path }}/* --names-only | tr '\n' ' ')" >> $GITHUB_OUTPUT shell: bash - id: split_repo From 22196a9db74af287250710bb23e0115138724501 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 27 Feb 2024 20:09:57 +0000 Subject: [PATCH 3/7] use temp action --- .github/workflows/reusable-build-coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable-build-coverage.yml b/.github/workflows/reusable-build-coverage.yml index 724270f..e4a0cb5 100644 --- a/.github/workflows/reusable-build-coverage.yml +++ b/.github/workflows/reusable-build-coverage.yml @@ -26,7 +26,7 @@ jobs: required-ros-distributions: ${{ inputs.ros_distro }} - uses: actions/checkout@v4 - id: package_list_action - uses: ros-controls/ros2_control_ci/.github/actions/set-package-list@master + uses: ros-controls/ros2_control_ci/.github/actions/set-package-list@lcov_paths with: path: src - uses: ros-tooling/action-ros-ci@0.3.6 From 2177192ad1507aff51d201307dc2f007c3cf995c Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 27 Feb 2024 21:03:28 +0000 Subject: [PATCH 4/7] Fix paths --- .github/actions/set-package-list/action.yml | 3 +-- .github/workflows/reusable-build-coverage.yml | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/actions/set-package-list/action.yml b/.github/actions/set-package-list/action.yml index 80e6efd..8a5c28c 100644 --- a/.github/actions/set-package-list/action.yml +++ b/.github/actions/set-package-list/action.yml @@ -4,7 +4,6 @@ description: 'Get a list of packages in the given path' inputs: path: description: 'Path to the repository after checkout' - required: true outputs: package_list: description: "A white-space separated list of packages" @@ -19,7 +18,7 @@ runs: steps: - id: colcon run: | - ls ${{ inputs.path }} + ls -lash echo "package_list=$(colcon list --paths ${{ inputs.path }} --names-only | tr '\n' ' ') $(colcon list --paths ${{ inputs.path }}/* --names-only | tr '\n' ' ')" >> $GITHUB_OUTPUT shell: bash - id: split_repo diff --git a/.github/workflows/reusable-build-coverage.yml b/.github/workflows/reusable-build-coverage.yml index e4a0cb5..c1429f2 100644 --- a/.github/workflows/reusable-build-coverage.yml +++ b/.github/workflows/reusable-build-coverage.yml @@ -27,8 +27,6 @@ jobs: - uses: actions/checkout@v4 - id: package_list_action uses: ros-controls/ros2_control_ci/.github/actions/set-package-list@lcov_paths - with: - path: src - uses: ros-tooling/action-ros-ci@0.3.6 with: target-ros2-distro: ${{ inputs.ros_distro }} From a189177bacf7cb48db3fca0210aa5b9274b1e19c Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 27 Feb 2024 21:16:13 +0000 Subject: [PATCH 5/7] Go back to master branch --- .github/workflows/reusable-build-coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable-build-coverage.yml b/.github/workflows/reusable-build-coverage.yml index c1429f2..e41367c 100644 --- a/.github/workflows/reusable-build-coverage.yml +++ b/.github/workflows/reusable-build-coverage.yml @@ -26,7 +26,7 @@ jobs: required-ros-distributions: ${{ inputs.ros_distro }} - uses: actions/checkout@v4 - id: package_list_action - uses: ros-controls/ros2_control_ci/.github/actions/set-package-list@lcov_paths + uses: ros-controls/ros2_control_ci/.github/actions/set-package-list@master - uses: ros-tooling/action-ros-ci@0.3.6 with: target-ros2-distro: ${{ inputs.ros_distro }} From 6f808e52fb173696e243a6597e0140a9861f4483 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 27 Feb 2024 21:20:28 +0000 Subject: [PATCH 6/7] Remove debug output --- .github/actions/set-package-list/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/set-package-list/action.yml b/.github/actions/set-package-list/action.yml index 8a5c28c..10e127a 100644 --- a/.github/actions/set-package-list/action.yml +++ b/.github/actions/set-package-list/action.yml @@ -18,7 +18,6 @@ runs: steps: - id: colcon run: | - ls -lash echo "package_list=$(colcon list --paths ${{ inputs.path }} --names-only | tr '\n' ' ') $(colcon list --paths ${{ inputs.path }}/* --names-only | tr '\n' ' ')" >> $GITHUB_OUTPUT shell: bash - id: split_repo From 06fd9b0ea35f14a12810dc900e8e9ff0ad5f0eee Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 27 Feb 2024 21:28:16 +0000 Subject: [PATCH 7/7] Remove env variable --- .github/workflows/reusable-build-coverage.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/reusable-build-coverage.yml b/.github/workflows/reusable-build-coverage.yml index e41367c..1f70f55 100644 --- a/.github/workflows/reusable-build-coverage.yml +++ b/.github/workflows/reusable-build-coverage.yml @@ -12,10 +12,6 @@ on: default: 'ubuntu-latest' type: string -env: - # this will be src/{repo-owner}/{repo-name} - path: src/${{ github.repository }} - jobs: coverage: name: coverage build ${{ inputs.ros_distro }}