Skip to content
This repository was archived by the owner on Feb 5, 2025. It is now read-only.

Commit 1b60935

Browse files
fix(build): add shrinkwrap one more time
1 parent 3ced11d commit 1b60935

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

scripts/release/release.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -392,9 +392,9 @@ verify()
392392
# It's strongly discouraged for library authors to publish shrinkwrap.json, since that would prevent end users from
393393
# having control over transitive dependency updates. See https://docs.npmjs.com/files/shrinkwrap.json
394394
#
395-
#if [ -n "$PTNFLY" -o -n "$PTNFLY_ANGULAR" -o -n "$RCUE" -o -n "$PTNFLY_WC" ]; then
396-
# shrinkwrap
397-
#fi
395+
if [ -n "$PTNFLY" -o -n "$PTNFLY_ANGULAR" -o -n "$RCUE" -o -n "$PTNFLY_WC" ]; then
396+
shrinkwrap
397+
fi
398398

399399
commit # Changes must be committed prior to bower verify step
400400
verify $VERIFY_DIR $BUILD_DIR

scripts/semantic-release/_publish-branch.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ commit()
4242
fi
4343
if [ -n "$COMMIT_CHANGES" ]; then
4444
# For semantic release, revert undesirable changes to package.json and package-lock
45-
git checkout $PACKAGE_JSON $PACKAGE_LOCK_JSON
45+
git checkout $PACKAGE_JSON
46+
git checkout $PACKAGE_LOCK_JSON
4647

4748
git add -A
4849
if [ -n "SEPARATE_COMMITS" ]; then

scripts/semantic-release/_publish-npm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ publish_npm()
114114
WHOAMI=`npm whoami`
115115
if [ "$WHOAMI" != "patternfly-build" -a -n "$NPM_USER" -a -n "$NPM_PWD" ]; then
116116
printf "$NPM_USER\n$NPM_PWD\n$NPM_USER@redhat.com" | npm login
117-
check $? "npm login failure"
117+
check $? "npm login failure" warn
118118
fi
119119

120120
JUNK=`grep '"name": "@' package.json`

scripts/semantic-release/_release.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@ verify()
134134
# It's strongly discouraged for library authors to publish shrinkwrap.json, since that would prevent end users from
135135
# having control over transitive dependency updates. See https://docs.npmjs.com/files/shrinkwrap.json
136136
#
137-
#if [ -n "$PTNFLY" -o -n "$PTNFLY_ANGULAR" ]; then
138-
# shrinkwrap
139-
#fi
137+
if [ -n "$PTNFLY" -o -n "$PTNFLY_ANGULAR" ]; then
138+
shrinkwrap
139+
fi
140140

141141
verify
142142
publish_branch

0 commit comments

Comments
 (0)