Skip to content

[BEAM-11640] Linkage Checker version upgrade to 1.5.4 (latest) #13757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 26, 2021
Merged

[BEAM-11640] Linkage Checker version upgrade to 1.5.4 (latest) #13757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
abeab7d
Upgrading version to the latest 1.5.4
suztomo Jan 14, 2021
c7ce112
Enhancing error hanlding for build failure
suztomo Jan 14, 2021
144e0d0
Updated the usage in the comment
suztomo Jan 19, 2021
f88b1e5
Merge remote-tracking branch 'origin/master' into linkage_checker_1.5.4
suztomo Jan 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ if (project.hasProperty('javaLinkageArtifactIds')) {

configurations { linkageCheckerJava }
dependencies {
linkageCheckerJava "com.google.cloud.tools:dependencies:1.5.0"
linkageCheckerJava "com.google.cloud.tools:dependencies:1.5.4"
}

// We need to evaluate all the projects first so that we can find depend on all the
Expand Down
18 changes: 13 additions & 5 deletions sdks/java/build-tools/beam-linkage-check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@
#

# This script compares linkage errors (checkJavaLinkage task in the root gradle project) between
# one branch and master branch.
# This is a temporary solution before Linkage Checker implements exclusion rules (BEAM-9206).
# one branch and another.

# Usage:
# /bin/bash sdks/java/build-tools/beam-linkage-check.sh
# /bin/bash sdks/java/build-tools/beam-linkage-check.sh origin/master <your branch>
#
# By default, this checks the Maven artifacts listed in ARTIFACTS variable below.
#
Expand Down Expand Up @@ -87,7 +86,7 @@ function runLinkageCheck () {
MODE=$1 # "baseline" or "validate"

for ARTIFACT_LIST in $ARTIFACT_LISTS; do
echo "`date`:" "Running linkage check (${MODE}) for ${ARTIFACT_LISTS}"
echo "`date`:" "Running linkage check (${MODE}) for ${ARTIFACT_LIST}"

BASELINE_FILE=${OUTPUT_DIR}/baseline-${ARTIFACT_LIST}.xml
if [ "$MODE" = "baseline" ]; then
Expand All @@ -96,6 +95,12 @@ function runLinkageCheck () {
elif [ "$MODE" = "validate" ]; then
BASELINE_OPTION="-PjavaLinkageReadBaseline=${BASELINE_FILE}"
echo "`date`:" "using baseline $BASELINE_FILE"
if [ ! -r "${BASELINE_FILE}" ]; then
# If baseline generation failed in previous baseline step, no need to build the project.
echo "`date`:" "Error: Baseline file not found"
ACCUMULATED_RESULT=1
continue
fi
else
BASELINE_OPTION=""
echo "`date`:" "Unexpected mode: ${MODE}. Not using baseline file."
Expand All @@ -107,7 +112,10 @@ function runLinkageCheck () {
RESULT=$?
set -e
set +x
if [ "$MODE" = "validate" ]; then
if [ "$MODE" = "baseline" ] && [ ! -r "${BASELINE_FILE}" ]; then
echo "`date`:" "Failed to generate the baseline file. Check the build error above."
ACCUMULATED_RESULT=1
elif [ "$MODE" = "validate" ]; then
echo "`date`:" "Done: ${RESULT}"
ACCUMULATED_RESULT=$((ACCUMULATED_RESULT | RESULT))
fi
Expand Down