Skip to content
This repository was archived by the owner on Jan 25, 2023. It is now read-only.

Allow to force Yarn usage #440

Merged
merged 4 commits into from
Jul 2, 2020
Merged

Allow to force Yarn usage #440

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f830666
Allow to force Yarn usage
Embraser01 Jun 18, 2020
1520401
Don't use yarn if USE_YARN is false and only force install yarn if true
Embraser01 Jun 19, 2020
c1353e5
Short-circuit yarn check when env var is set
Embraser01 Jun 19, 2020
d0922eb
Prefix env var with NETLIFY_
Embraser01 Jul 2, 2020
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
4 changes: 2 additions & 2 deletions run-build-functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ install_dependencies() {
if [ -f package.json ]
then
restore_cwd_cache node_modules "node modules"
if [ -f yarn.lock ]
if [ "$NETLIFY_USE_YARN" = "true" ] || ([ "$NETLIFY_USE_YARN" != "false" ] && [ -f yarn.lock ])
then
run_yarn $YARN_VERSION
else
Expand All @@ -471,7 +471,7 @@ install_dependencies() {
then
if ! [ $(which bower) ]
then
if [ -f yarn.lock ]
if [ "$NETLIFY_USE_YARN" = "true" ] || ([ "$NETLIFY_USE_YARN" != "false" ] && [ -f yarn.lock ])
then
echo "Installing bower with Yarn"
yarn add bower
Expand Down