Whooops sauce_connect wasnt spinning up if cache hit, add OSX support

Author: jamesdaniels

.github/workflows/test.yml

@@ -33,11 +33,10 @@ jobs:
             ${{ runner.os }}-14-node_modules-
       - name: NPM install
         if: steps.node_modules_cache.outputs.cache-hit != 'true'
-        # Start sauce connect here, so it's ready to go by the time we need it
-        run: |
-          npm ci
-          ./buildtools/sauce_connect.sh &
+        run: npm ci
       - name: Build & run tests
         run: npm run test
       - name: Run tests in Saucelabs
-        run: ./buildtools/run_tests.sh --saucelabs
+        run: |
+          ./buildtools/sauce_connect.sh &
+          ./buildtools/run_tests.sh --saucelabs

buildtools/run_tests.sh

@@ -76,6 +76,10 @@ if [[ $1 = "--saucelabs" ]]; then
     seleniumStarted=false
     sleep 2
     echo "Using SauceLabs."
+    until [ -f '/tmp/sauce-connect-ready' ]
+    do
+      sleep 2
+    done
     # $2 contains the tunnelIdentifier argument if specified, otherwise is empty.
     $PROTRACTOR_BIN_PATH/protractor protractor.conf.js --saucelabs $2
   fi

buildtools/sauce_connect.sh

@@ -22,7 +22,11 @@
 #
 
 # Setup and start Sauce Connect locally.
-CONNECT_URL="https://saucelabs.com/downloads/sc-4.6.5-linux.tar.gz"
+if [[ $OSTYPE == 'darwin'* ]]; then
+  CONNECT_URL="https://saucelabs.com/downloads/sc-4.7.1-osx.zip"
+else
+  CONNECT_URL="https://saucelabs.com/downloads/sc-4.7.1-linux.tar.gz"
+fi
 CONNECT_DIR="/tmp/sauce-connect-$RANDOM"
 CONNECT_DOWNLOAD="sc-latest-linux.tar.gz"
 
@@ -33,8 +37,17 @@ mkdir -p $CONNECT_DIR
 cd $CONNECT_DIR
 curl $CONNECT_URL -o $CONNECT_DOWNLOAD 2> /dev/null 1> /dev/null
 mkdir sauce-connect
-tar --extract --file=$CONNECT_DOWNLOAD --strip-components=1 \
+
+if [[ $OSTYPE == 'darwin'* ]]; then
+  unzip -d sauce-connect $CONNECT_DOWNLOAD &&
+    f=(sauce-connect/*) &&
+    mv sauce-connect/*/* sauce-connect &&
+    rmdir "${f[@]}"
+else
+  tar --extract --file=$CONNECT_DOWNLOAD --strip-components=1 \
     --directory=sauce-connect > /dev/null
+fi
+
 rm $CONNECT_DOWNLOAD
 
 function removeFiles() {
@@ -63,4 +76,4 @@ echo "Starting Sauce Connect..."
 
 # Start SauceConnect.
 sauce-connect/bin/sc -u $SAUCE_USERNAME -k $SAUCE_ACCESS_KEY \
-    -i $TUNNEL_IDENTIFIER
+    -i $TUNNEL_IDENTIFIER -f $BROWSER_PROVIDER_READY_FILE