Skip to content

Commit

Permalink
ci: support non-multimodule child modules in submodule lookup (#10842)
Browse files Browse the repository at this point in the history
* ci: support non-multimodule child modules in submodule lookup

* ci: insignificant change to trigger integration tests

* Revert "ci: insignificant change to trigger integration tests"

This reverts commit bf220e4.
  • Loading branch information
burkedavison committed May 14, 2024
1 parent bc33620 commit fb3a3c9
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions .kokoro/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,18 @@ function retry_with_backoff {
function parse_submodules() {
pushd "$1" >/dev/null

# New-line-delimited string containing the current folder's pom.xml <module> names.
mvn_submodules=$(mvn help:evaluate -Dexpression=project.modules \
| grep '<.*>.*</.*>' \
| sed -e 's/<.*>\(.*\)<\/.*>/\1/g')

submodules_array=()
for submodule in $mvn_submodules; do
# Each entry = <folder>/<submodule>
submodules_array+=("$1/${submodule}");
done
mvn_submodules=$(mvn help:evaluate -Dexpression=project.modules)
if mvn_submodules=$(grep '<.*>.*</.*>' <<< "$mvn_submodules"); then
mvn_submodules=$(sed -e 's/<.*>\(.*\)<\/.*>/\1/g' <<< "$mvn_submodules")
for submodule in $mvn_submodules; do
# Each entry = <folder>/<submodule>
submodules_array+=("$1/${submodule}");
done
else
# If this module contains no submodules, select the module itself.
submodules_array+=("$1");
fi

# Convert from array to comma-delimited string
submodules=$(
Expand Down

0 comments on commit fb3a3c9

Please sign in to comment.