From 630aa18d42af4d5ae50cfa3d992e2ae856064be3 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Thu, 8 Sep 2022 15:53:17 +0000 Subject: [PATCH] chore: Remove jq from javadoc script --- .kokoro/release/publish_javadoc11.sh | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index 78017074848d..97982999bb42 100755 --- a/.kokoro/release/publish_javadoc11.sh +++ b/.kokoro/release/publish_javadoc11.sh @@ -30,15 +30,8 @@ pushd $(dirname "$0")/../../ # install docuploader package python3 -m pip install gcp-docuploader -apt-get update -# install jq to extract field from json file -apt-get install -y jq - doclet_name="java-docfx-doclet-1.7.0.jar" -# compile all packages -#mvn clean install -B -q -DskipTests -Dcheckstyle.skip -Denforcer.skip=true -T 1C - # Retrieve list of modules from aggregator pom modules=$(mvn help:evaluate -Dexpression=project.modules | grep '<.*>.*' | sed -e 's/<.*>\(.*\)<\/.*>/\1/g') excluded_modules=('CoverageAggregator' 'google-cloud-gapic-bom') @@ -48,8 +41,8 @@ do # Proceed if module is not excluded if [[ ! "${excluded_modules[*]}" =~ $module ]]; then pushd $module - # Extract Cloud RAD module name - NAME=$(jq -r '.distribution_name' .repo-metadata.json | cut -d ':' -f 2) + # Extract Cloud RAD module name from `distribution_name` in .repo-metadata.json + NAME=$(grep -o '"distribution_name": "[^"]*' .repo-metadata.json | grep -o '[^"]*$' | cut -d ':' -f 2) # Extract (current) version from versions.txt and remove `-SNAPSHOT` VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3 | sed -e 's/-SNAPSHOT//g') echo "Running for ${NAME}-${VERSION}"