Merge pull request #989 from basecamp/saucelabs-tunnel

Configure Sauce Connect Proxy to work with Github actions

.github/workflows/ci.yml

@@ -15,6 +15,16 @@ jobs:
       with:
         path: test/node_modules
         key: ${{ runner.os }}-${{ hashFiles('test/yarn.lock') }}
+    - uses: saucelabs/sauce-connect-action@v2
+      with:
+        username: ${{ secrets.SAUCE_USERNAME }}
+        accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
+        tunnelName: Basecamp-CI_tunnel_name
+        region: us-west
 
     - run: yarn install
     - run: bin/ci
+
+env:
+  SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
+  SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}

bin/ci

@@ -13,12 +13,4 @@ if [ -n "$CI" ]; then
   echo "GITHUB_BASE_REF: $GITHUB_BASE_REF"
 fi
 
-if [ -n "$CI" ] && [ "$GITHUB_REF" == "refs/heads/main" ] && [ -z "$GITHUB_HEAD_REF" ]; then
-  $(base64 --decode <<< ZXhwb3J0IFNBVUNFX1VTRVJOQU1FPWJhc2VjYW1wX3RyaXgK)
-  $(base64 --decode <<< ZXhwb3J0IFNBVUNFX0FDQ0VTU19LRVk9MjY3OGE4NzMtNzJmNC00NzU2LTkzYjUtZjFhOGUyZTc3ODIxCg==)
-else
-  $(base64 --decode <<< ZXhwb3J0IFNBVUNFX1VTRVJOQU1FPWJhc2VjYW1wX3RyaXhfZGV2Cg==)
-  $(base64 --decode <<< ZXhwb3J0IFNBVUNFX0FDQ0VTU19LRVk9NTIzODNlNTItZTM4NC00MzZjLWFkMmUtMGZmNTcyNjIyNjc5Cg==)
-fi
-
 yarn test

package.json

@@ -28,21 +28,21 @@
     "@babel/core": "^7.16.0",
     "@babel/preset-env": "^7.16.4",
     "@rollup/plugin-babel": "^5.3.0",
+    "@rollup/plugin-commonjs": "^22.0.2",
     "@rollup/plugin-json": "^4.1.0",
+    "@rollup/plugin-node-resolve": "^13.3.0",
     "babel-eslint": "^10.1.0",
     "eslint": "^7.32.0",
     "esm": "^3.2.25",
-    "karma": "5.0.2",
-    "karma-chrome-launcher": "3.1.0",
+    "karma": "6.4.0",
+    "karma-chrome-launcher": "3.1.1",
     "karma-qunit": "^4.1.2",
     "karma-sauce-launcher": "^4.3.6",
     "node-sass": "^7.0.1",
     "qunit": "2.9.3",
     "rangy": "^1.3.0",
     "rollup": "^2.56.3",
-    "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-includepaths": "^0.2.4",
-    "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-terser": "^7.0.2",
     "svgo": "^2.8.0"
   },

rollup.config.js

@@ -1,8 +1,8 @@
 import json from "@rollup/plugin-json"
 import includePaths from "rollup-plugin-includepaths"
-import commonjs from "rollup-plugin-commonjs"
+import commonjs from "@rollup/plugin-commonjs"
 import { babel } from "@rollup/plugin-babel"
-import nodeResolve from "rollup-plugin-node-resolve"
+import nodeResolve from "@rollup/plugin-node-resolve"
 import { terser } from "rollup-plugin-terser"
 
 import { version } from "./package.json"