Skip to content

Commit c1fcd9f

Browse files
committed
[skip ci] exclude cli & forge-cli for license files due to #14886
1 parent e4864f0 commit c1fcd9f

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

etc/bin/verify-jar-artifacts.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ while IFS= read -r line; do
129129
exit 1
130130
fi
131131

132-
if [[ $JAR_FILE != *-javadoc.jar ]]; then
132+
if [[ $ARTIFACT_ID != grails-cli && $ARTIFACT_ID != grails-forge-cli && $JAR_FILE != *-javadoc.jar ]]; then
133133
echo "... Verifying required files exist in non-javadoc jar..."
134134
required_jar_contents=(META-INF/LICENSE META-INF/DISCLAIMER META-INF/NOTICE)
135135
missing_jar_contents=()

etc/bin/verify-source-distribution.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ SRC_DIR="grails"
6161
if [ -d "${SRC_DIR}" ]; then
6262
echo "Previous grails directory found, purging"
6363
cd grails
64-
find . -mindepth 1 -path ./etc -prune -o -exec rm -rf {} +
64+
find . -mindepth 1 -path ./etc -prune -o -exec rm -rf {} + || true
6565
cd etc
66-
find . -mindepth 1 -path ./bin -prune -o -exec rm -rf {} +
66+
find . -mindepth 1 -path ./bin -prune -o -exec rm -rf {} + || true
6767
cd bin
68-
find . -mindepth 1 -path ./results -prune -o -exec rm -rf {} +
68+
find . -mindepth 1 -path ./results -prune -o -exec rm -rf {} +|| true
6969
cd "${DOWNLOAD_LOCATION}"
7070
fi
7171
echo "Extracting zip file..."

0 commit comments

Comments
 (0)