From 746495a22206f363b0bd43cfea22a5369c7fbf4d Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Mon, 19 Jun 2017 18:30:01 +0200 Subject: [PATCH] build: update sauce connect version (#5179) * Updates the version of Sauce Connect to avoid potential flakes within the Saucelabs tunnels * Fixes the invalid path for the `deploy-dashboard` script that runs in the deploy build stage --- scripts/ci/publish-artifacts.sh | 2 +- scripts/deploy/deploy-dashboard.sh | 12 ++++++------ scripts/saucelabs/start-tunnel.sh | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/ci/publish-artifacts.sh b/scripts/ci/publish-artifacts.sh index 56fe671737f..b4be9e95bed 100755 --- a/scripts/ci/publish-artifacts.sh +++ b/scripts/ci/publish-artifacts.sh @@ -27,6 +27,6 @@ $(npm bin)/gulp docs # Deploy the screenshot and dashboard functions for each push build. ./scripts/deploy/deploy-screenshot-functions.sh & -./scripts/deploy/deploy-dashboard-functions.sh & +./scripts/deploy/deploy-dashboard.sh & wait diff --git a/scripts/deploy/deploy-dashboard.sh b/scripts/deploy/deploy-dashboard.sh index 4c32cd7910f..46203a81c36 100755 --- a/scripts/deploy/deploy-dashboard.sh +++ b/scripts/deploy/deploy-dashboard.sh @@ -6,6 +6,12 @@ # Go to the project root directory cd $(dirname ${0})/../.. +if [ -z ${MATERIAL2_BOARD_FIREBASE_DEPLOY_KEY} ]; then + echo "Error: No access token for firebase specified." \ + "Please set the environment variable 'MATERIAL2_DASHBOARD_ACCESS_TOKEN'." + exit 1 +fi + # Paths to the dashboard and functions directories. dashboardFolder=tools/dashboard @@ -23,12 +29,6 @@ cd ${dashboardFolder} # build in production afterwards. Wait for all async tasks to finish before proceeding. wait -if [ -z ${MATERIAL2_BOARD_FIREBASE_DEPLOY_KEY} ]; then - echo "Error: No access token for firebase specified." \ - "Please set the environment variable 'MATERIAL2_DASHBOARD_ACCESS_TOKEN'." - exit 1 -fi - # Deploy the dashboard to Firebase. Based on the current configuration hosting and functions # will be deployed. $(npm bin)/firebase deploy --token ${MATERIAL2_BOARD_FIREBASE_DEPLOY_KEY} --project material2-board diff --git a/scripts/saucelabs/start-tunnel.sh b/scripts/saucelabs/start-tunnel.sh index 23b09c5e7c4..ff6eee01067 100755 --- a/scripts/saucelabs/start-tunnel.sh +++ b/scripts/saucelabs/start-tunnel.sh @@ -2,7 +2,7 @@ set -e -o pipefail -TUNNEL_FILE="sc-4.4.6-linux.tar.gz" +TUNNEL_FILE="sc-4.4.7-linux.tar.gz" TUNNEL_URL="https://saucelabs.com/downloads/${TUNNEL_FILE}" TUNNEL_DIR="/tmp/saucelabs-connect"