grafana-snap

Merge grafana-snap:snap-build into grafana-snap:master

  1. Git
  2. lp:grafana-snap
  3. snap-build
  4. Merge into master
Proposed by Gabriel Cocenza
Status: Merged
Approved by: Tianqi Xiao
Approved revision: a44fb26b6b3228b17800962f780495a163c51960
Merged at revision: a44fb26b6b3228b17800962f780495a163c51960
Proposed branch: grafana-snap:snap-build
Merge into: grafana-snap:master
Diff against target: 25 lines (+7/-0)
1 file modified
snapcraft.yaml (+7/-0)
Reviewer Review Type Date Requested Status
Tianqi Xiao (community) Approve
Robert Gildein Approve
Giuseppe Petralia Approve
Review via email: mp+435748@code.launchpad.net

Commit message

Set proxy variables for remote build and network-concurrency.

To post a comment you must log in.
Revision history for this message
Giuseppe Petralia (peppepetra) wrote :

lgtm, thanks for this change

review: Approve
Revision history for this message
Robert Gildein (rgildein) wrote :

LGTM

review: Approve
Revision history for this message
Tianqi Xiao (txiao) wrote :

LGTM

Note for record: The `network-concurrency` flag is a workaround to get pass the yarn failure in CI and it can only be tested after merging the MP.

review: Approve

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 edcbf60..1b25a9d 100644
3--- a/snapcraft.yaml
4+++ b/snapcraft.yaml
5@@ -58,6 +58,12 @@ parts:
6 build-environment:
7 - NODE_VERSION: "14.15.5"
8 override-build: |
9+ # workaround for build.snapcraft.io builds
10+ # https://bugs.launchpad.net/bugs/1886861
11+ if [ -n "$http_proxy" ]; then
12+ export GLOBAL_AGENT_HTTP_PROXY="${http_proxy}"
13+ export GLOBAL_AGENT_HTTPS_PROXY="${http_proxy}"
14+ fi
15 set -x
16 # install the official nodejs
17 if [ $SNAP_ARCH == "amd64" ]; then
18@@ -86,6 +92,7 @@ parts:
19 export PYTHON=/usr/bin/python2
20 PATH="$PATH:$SNAPCRAFT_PART_BUILD/node_modules/.bin:$SNAPCRAFT_PART_INSTALL/bin"
21 NODE_ENV="production"
22+ yarn install --network-concurrency 1
23 yarn install --pure-lockfile --no-progress
24 npx browserslist@latest --update-db
25 yarn build

Subscribers

No one subscribed via source and target branches