From 9a82b74e062a19f20fb723b5fa6fc4246070899b Mon Sep 17 00:00:00 2001
From: Kevin Gartland <kgartland@rstudio.com>
Date: Fri, 3 Nov 2023 10:00:30 -0400
Subject: [PATCH] use cross-env for windows

---
 .github/workflows/cypress-nightly.yaml |  6 ------
 test/cy/package-lock.json              | 19 +++++++++++++++++++
 test/cy/package.json                   |  3 ++-
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/cypress-nightly.yaml b/.github/workflows/cypress-nightly.yaml
index 90bd0e4de..d2a5c6f51 100644
--- a/.github/workflows/cypress-nightly.yaml
+++ b/.github/workflows/cypress-nightly.yaml
@@ -31,9 +31,3 @@ jobs:
       - run: just cy install
       - run: just cy test
       - run: just cy test-deploy
-
-      - name: Setup tmate session
-        if: ${{ failure() }}
-        uses: mxschmitt/action-tmate@v3
-        with:
-          limit-access-to-actor: true
\ No newline at end of file
diff --git a/test/cy/package-lock.json b/test/cy/package-lock.json
index 923085b37..1c6c6af22 100644
--- a/test/cy/package-lock.json
+++ b/test/cy/package-lock.json
@@ -5,6 +5,7 @@
   "packages": {
     "": {
       "devDependencies": {
+        "cross-env": "^7.0.3",
         "cypress": "^13.3.0",
         "eslint": "^8.51.0",
         "eslint-plugin-cypress": "^2.15.1",
@@ -780,6 +781,24 @@
       "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
       "dev": true
     },
+    "node_modules/cross-env": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
+      "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.1"
+      },
+      "bin": {
+        "cross-env": "src/bin/cross-env.js",
+        "cross-env-shell": "src/bin/cross-env-shell.js"
+      },
+      "engines": {
+        "node": ">=10.14",
+        "npm": ">=6",
+        "yarn": ">=1"
+      }
+    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
diff --git a/test/cy/package.json b/test/cy/package.json
index 20a932cae..9666d6b3e 100644
--- a/test/cy/package.json
+++ b/test/cy/package.json
@@ -8,9 +8,10 @@
     "test-deploy": "start-server-and-test --expect 401 start http-get://127.0.0.1:9000 run-deploy",
     "open": "cypress open",
     "run": "cypress run --spec ./cypress/e2e/publish-ui/*.cy.js --env token=token",
-    "run-deploy": "cypress run --spec ./cypress/e2e/deploy/*.cy.js --env token=token,CYPRESS_CONNECT_ADDRESS=$CYPRESS_CONNECT_ADDRESS"
+    "run-deploy": "cross-env cypress run --spec ./cypress/e2e/deploy/*.cy.js --env token=token,CYPRESS_CONNECT_ADDRESS=$CYPRESS_CONNECT_ADDRESS"
   },
   "devDependencies": {
+    "cross-env": "^7.0.3",
     "cypress": "^13.3.0",
     "eslint": "^8.51.0",
     "eslint-plugin-cypress": "^2.15.1",