Merge branch 'master' into dev-server-no-store

.circleci/Makefile

@@ -1,5 +1,5 @@
-SHELL       := /usr/bin/env bash
-.SHELLFLAGS := -euo pipefail -c
+# SHELL includes all flags for maximum compatibility, see https://fieldnotes.tech/how-to-shell-for-compatible-makefiles/
+SHELL := /usr/bin/env bash -euo pipefail -c
 
 # CONFIG is the name of the make target someone
 # would invoke to update the main config file (config.yml).

.circleci/config/@config.yml

@@ -37,6 +37,7 @@ executors:
   go:
     docker:
       - image: *GOLANG_IMAGE
+    shell: /usr/bin/env bash -euo pipefail -c
     working_directory: /src
   go-machine:
     machine: true
@@ -45,9 +46,11 @@ executors:
       GO_VERSION: 1.12.4  # Pin Go to patch version (ex: 1.2.3)
       GOTESTSUM_VERSION: 0.3.3  # Pin gotestsum to patch version (ex: 1.2.3)
       GO_TAGS:
+    shell: /usr/bin/env bash -euo pipefail -c
     working_directory: ~/src
   node:
     docker:
       - image: *NODE_IMAGE
+    shell: /usr/bin/env bash -euo pipefail -c
     working_directory: /src
 

.circleci/config/commands/go_test.yml

@@ -8,7 +8,7 @@ steps:
       name: Run Go tests
       no_output_timeout: 20m
       command: |
-        set -eux -o pipefail
+        set -x
 
         # Install Go
         curl -sSLO "https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz"

.circleci/config/jobs/build-go-dev.yml

@@ -7,8 +7,6 @@ steps:
   - run:
       name: Build dev binary
       command: |
-        set -eux -o pipefail
-
         # Move dev UI assets to expected location
         rm -rf ./pkg
         mkdir ./pkg

.circleci/config/jobs/install-ui-dependencies.yml

@@ -5,8 +5,6 @@ steps:
   - run:
       name: Install UI dependencies
       command: |
-        set -eux -o pipefail
-
         cd ui
         yarn install --ignore-optional
         npm rebuild node-sass

.circleci/config/jobs/test-go-race.yml

@@ -4,8 +4,6 @@ steps:
   - run:
       name: Allow circleci user to restore Go modules cache
       command: |
-        set -eux -o pipefail
-
         sudo mkdir /go
         sudo chown -R circleci:circleci /go
   - restore_go_cache

.circleci/config/jobs/test-go.yml

@@ -5,8 +5,6 @@ steps:
   - run:
       name: Allow circleci user to restore Go modules cache
       command: |
-        set -eux -o pipefail
-
         sudo mkdir /go
         sudo chown -R circleci:circleci /go
   - restore_go_cache

.circleci/config/jobs/test-ui-browserstack.yml

@@ -0,0 +1,12 @@
+executor: node
+steps:
+  - checkout
+  - restore_yarn_cache
+  - attach_workspace:
+      at: .
+  - run:
+      name: Run Browserstack Tests
+      command: |
+        # Add ./bin to the PATH so vault binary can be found.
+        export PATH="${PWD}"/bin:${PATH}
+        make test-ui-browserstack

.circleci/config/jobs/test-ui.yml

@@ -8,7 +8,7 @@ steps:
   - run:
       name: Test UI
       command: |
-        set -eux -o pipefail
+        set -x
 
         # Install Chrome
         wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub \

.circleci/config/workflows/ci.yml

@@ -13,6 +13,10 @@ jobs:
       requires:
         - install-ui-dependencies
         - build-go-dev
+  - test-ui-browserstack:
+      requires:
+        - install-ui-dependencies
+        - build-go-dev
   - test-go:
       requires:
         - build-go-dev