diff --git a/clang-tidy/action.yaml b/clang-tidy/action.yaml index 1488000b..45c9b923 100644 --- a/clang-tidy/action.yaml +++ b/clang-tidy/action.yaml @@ -21,6 +21,9 @@ inputs: build-depends-repos: description: "" required: false + packages-above-repos: + description: "" + required: false cmake-build-type: description: "" required: false @@ -59,7 +62,7 @@ runs: shell: bash - name: Set git config - if: ${{ inputs.build-depends-repos != ''}} + if: ${{ inputs.build-depends-repos != '' || inputs.packages-above-repos != '' }} uses: autowarefoundation/autoware-github-actions/set-git-config@v1 with: token: ${{ inputs.token }} @@ -71,6 +74,13 @@ runs: vcs import dependency_ws < ${{ inputs.build-depends-repos }} shell: bash + - name: Clone above dependency packages + if: ${{ inputs.packages-above-repos != '' }} + run: | + mkdir -p dependency_ws + vcs import dependency_ws < ${{ inputs.packages-above-repos }} + shell: bash + - name: Run rosdep install run: | package_paths=$(colcon list -p --packages-above-and-dependencies ${{ inputs.target-packages }} --base-paths . dependency_ws) diff --git a/colcon-build/README.md b/colcon-build/README.md index b50fd4f8..72472e50 100644 --- a/colcon-build/README.md +++ b/colcon-build/README.md @@ -26,6 +26,7 @@ jobs: rosdistro: galactic target-packages: ${{ steps.get-modified-packages.outputs.modified-packages }} build-depends-repos: build_depends.repos + packages-above-repos: packages_above.repos ``` ## Inputs @@ -35,6 +36,7 @@ jobs: | rosdistro | true | ROS distro. | | target-packages | true | The target packages to build. | | build-depends-repos | false | The `.repos` file that includes build dependencies. | +| packages-above-repos | false | The `.repos` file that includes above build dependencies. | | cmake-build-type | false | The value for `CMAKE_BUILD_TYPE`. | | token | false | The token for build dependencies. | | include-eol-distros | false | If true, adds `--include-eol-distros` to `rosdep update`. | diff --git a/colcon-build/action.yaml b/colcon-build/action.yaml index 131b1eb8..66775b7a 100644 --- a/colcon-build/action.yaml +++ b/colcon-build/action.yaml @@ -57,7 +57,7 @@ runs: shell: bash - name: Set git config - if: ${{ inputs.build-depends-repos != '' }} + if: ${{ inputs.build-depends-repos != '' || inputs.packages-above-repos != '' }} uses: autowarefoundation/autoware-github-actions/set-git-config@v1 with: token: ${{ inputs.token }} diff --git a/colcon-test/README.md b/colcon-test/README.md index 10c01c6e..05addabe 100644 --- a/colcon-test/README.md +++ b/colcon-test/README.md @@ -27,6 +27,7 @@ jobs: rosdistro: galactic target-packages: ${{ steps.get-modified-packages.outputs.modified-packages }} build-depends-repos: build_depends.repos + packages-above-repos: packages_above.repos test: needs: build @@ -57,6 +58,7 @@ jobs: rosdistro: galactic target-packages: ${{ steps.get-modified-packages.outputs.modified-packages }} build-depends-repos: build_depends.repos + packages-above-repos: packages_above.repos - name: Upload coverage to Codecov if: ${{ steps.test.outputs.coverage-report-files != '' }} @@ -70,12 +72,13 @@ jobs: ## Inputs -| Name | Required | Description | -| ------------------- | -------- | --------------------------------------------------- | -| rosdistro | true | ROS distro. | -| target-packages | true | The target packages to test. | -| build-depends-repos | false | The `.repos` file that includes build dependencies. | -| token | false | The token for build dependencies. | +| Name | Required | Description | +| -------------------- | -------- | --------------------------------------------------------- | +| rosdistro | true | ROS distro. | +| target-packages | true | The target packages to test. | +| build-depends-repos | false | The `.repos` file that includes build dependencies. | +| packages-above-repos | false | The `.repos` file that includes above build dependencies. | +| token | false | The token for build dependencies. | ## Outputs diff --git a/colcon-test/action.yaml b/colcon-test/action.yaml index 6730cfae..c921a8e1 100644 --- a/colcon-test/action.yaml +++ b/colcon-test/action.yaml @@ -52,7 +52,7 @@ runs: shell: bash - name: Set git config - if: ${{ inputs.build-depends-repos != '' }} + if: ${{ inputs.build-depends-repos != '' || inputs.packages-above-repos != '' }} uses: autowarefoundation/autoware-github-actions/set-git-config@v1 with: token: ${{ inputs.token }}