Merge ~rbarry/grafana-snap:rock into grafana-snap:rock

Proposed by Ryan Barry
Status: Merged
Approved by: Ryan Barry
Approved revision: 874e63d444498b7741c8b6c4af54cad133ad6cc2
Merged at revision: 874e63d444498b7741c8b6c4af54cad133ad6cc2
Proposed branch: ~rbarry/grafana-snap:rock
Merge into: grafana-snap:rock
Diff against target: 20 lines (+3/-5)
1 file modified
snapcraft.yaml (+3/-5)
Reviewer Review Type Date Requested Status
BootStack Reviewers Pending
Review via email: mp+430350@code.launchpad.net

Commit message

Only set proxy options for yarn

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/snapcraft.yaml b/snapcraft.yaml
2index 9361535..331fdf7 100644
3--- a/snapcraft.yaml
4+++ b/snapcraft.yaml
5@@ -89,12 +89,10 @@ parts:
6 npm config set unsafe-perm true
7 # We have to limit node's max memory usage otherwise we'll run
8 # into OOM issues even with a 10GB RAM VM.
9- NODE_OPTIONS="--max-old-space-size=8192"
10- [[ -v http_proxy ]] && NODE_OPTIONS="${NODE_OPTIONS} --proxy ${http_proxy}"
11- [[ -v https_proxy ]] && NODE_OPTIONS="${NODE_OPTIONS} --https-proxy ${https_proxy}"
12- export NODE_OPTIONS=${NODE_OPTIONS}
13+ export NODE_OPTIONS="--max-old-space-size=8192"
14 npm install --location=global --prefix $SNAPCRAFT_PART_BUILD yarn
15- env | sort
16+ [[ -v http_proxy ]] && yarn config set httpProxy ${http_proxy}
17+ [[ -v https_proxy ]] && yarn config set httpxProxy ${https_proxy}
18 yarn config
19 YARN_ENABLE_PROGRESS_BARS=false yarn install --immutable
20 yarn run build

Subscribers

People subscribed via source and target branches

to all changes: