Merge pull request #2484 from PennyScissors/dev-v2.7

Fix release validation scripts
pull/2486/head
Steven Crespo 2023-03-15 15:50:42 -07:00 committed by GitHub
commit c587aee1a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions

View File

@ -7,8 +7,8 @@ OLD_CHART_DIR=$ROOT_DIR/charts
NEW_CHART_DIR=$ROOT_DIR/to-be-released
git fetch ${UPSTREAM_REMOTE}
cp -a $OLD_CHART_DIR $NEW_CHART_DIR
git checkout ${UPSTREAM_REMOTE}/${UPSTREAM_BRANCH} -- charts
mv $OLD_CHART_DIR $NEW_CHART_DIR
git checkout ${UPSTREAM_REMOTE}/${UPSTREAM_BRANCH} -- $OLD_CHART_DIR
rm -rf diffs_in_latest_version
mkdir -p diffs_in_latest_version
@ -28,5 +28,9 @@ for chart in $(echo $(ls ${OLD_CHART_DIR}) $(ls ${NEW_CHART_DIR}) | tr " " "\n"
prior_chart_version=$(ls ${OLD_CHART_DIR}/${chart} | sort -Vr | head -n 1)
diff -uNr ${OLD_CHART_DIR}/${chart}/${prior_chart_version} ${NEW_CHART_DIR}/${chart}/${latest_chart_version} > diffs_in_latest_version/${chart}/${prior_chart_version}-to-${latest_chart_version}.diff
rm -rf $NEW_CHART_DIR
done
if [[ -d $NEW_CHART_DIR ]]; then
rm -rf $NEW_CHART_DIR
git checkout HEAD -- $OLD_CHART_DIR
fi

View File

@ -34,7 +34,7 @@ for asset in $(find $ASSETS_DIR -mindepth 2 -maxdepth 2 -name "*.tgz" | sort | x
chartname=$(echo ${chart#"$ROOT_DIR/"} | cut -d'/' -f2)
chartversion=$(basename ${chart})
exists_in_25=$(yq e ".entries.*.[] | select(.name == \"${chartname}\" and .version == \"${chartversion}\")" <(git show ${UPSTREAM_REMOTE}/${OLD_UPSTREAM_BRANCH}:${INDEX_PATH}))
echo $exists_in_25
if [[ -n ${exists_in_25} ]]; then
echo "Skipping checking annotation on forward-ported chart ${chart}"
continue