Merge branch 'release/14.0.0' into remove-ff-gc

cypress-io · Oct 3, 2024 · b335363 · b335363
2 parents 1d3bea0 + 8ef2aa8
commit b335363
Show file tree

Hide file tree

Showing 10 changed files with 273 additions and 84 deletions.
diff --git a/.circleci/cache-version.txt b/.circleci/cache-version.txt
@@ -1,3 +1,3 @@
 # Bump this version to force CI to re-create the cache from scratch.
 
-10-02-24
+09-30-24-windows-patch-server-2022
diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml
@@ -76,7 +76,7 @@ windowsWorkflowFilters: &windows-workflow-filters
     - equal: [ develop, << pipeline.git.branch >> ]
     # use the following branch as well to ensure that v8 snapshot cache updates are fully tested
     - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
-    - equal: [ 'misc/remove_marionette_for_geckodriver', << pipeline.git.branch >> ]
+    - equal: [ 'chore/patch_windows_build', << pipeline.git.branch >> ]
     - matches:
         pattern: /^release\/\d+\.\d+\.\d+$/
         value: << pipeline.git.branch >>
@@ -562,6 +562,9 @@ commands:
       browser:
         description: browser shortname to target
         type: string
+      executor:
+        description: the executor in use. Only used if Windows for workaround purposes
+        type: executor
       percy:
         description: enable percy
         type: boolean
@@ -576,6 +579,16 @@ commands:
         default: ''
     steps:
       - restore_cached_workspace
+      # this is a temporary work around while we wait for circle to resolve issues with packages
+      # with an @ character in windows during save_cache.
+      # @see https://github.com/cypress-io/cypress/issues/30343 for more details.
+      - when:
+          condition:
+            equal: [ *windows-executor, << parameters.executor >> ]
+          steps:
+            - run:
+                name: reinstall dependencies to work around cache issue (Windows only)
+                command: rm -rf node_modules && yarn
       - windows-install-chrome:
           browser: <<parameters.browser>>
       - run:
@@ -1305,6 +1318,16 @@ jobs:
     resource_class: << parameters.resource_class >>
     steps:
       - restore_cached_workspace
+      # this is a temporary work around while we wait for circle to resolve issues with packages
+      # with an @ character in windows during save_cache.
+      # @see https://github.com/cypress-io/cypress/issues/30343 for more details.
+      - when:
+          condition:
+            equal: [ *windows-executor, << parameters.executor >> ]
+          steps:
+            - run:
+                name: reinstall dependencies to work around cache issue (Windows only)
+                command: rm -rf node_modules && yarn
       - run:
           name: Top level packages
           command: yarn list --depth=0 || true
@@ -1418,6 +1441,16 @@ jobs:
     steps:
       - restore_cached_workspace
       - restore_cached_system_tests_deps
+      # this is a temporary work around while we wait for circle to resolve issues with packages
+      # with an @ character in windows during save_cache.
+      # @see https://github.com/cypress-io/cypress/issues/30343 for more details.
+      - when:
+          condition:
+            equal: [ *windows-executor, << parameters.executor >> ]
+          steps:
+            - run:
+                name: reinstall dependencies to work around cache issue (Windows only)
+                command: rm -rf node_modules && yarn
       # TODO: Remove this once we switch off self-hosted M1 runners
       - when:
           condition:
@@ -1463,6 +1496,16 @@ jobs:
     parallelism: 1
     steps:
       - restore_cached_workspace
+      # this is a temporary work around while we wait for circle to resolve issues with packages
+      # with an @ character in windows during save_cache.
+      # @see https://github.com/cypress-io/cypress/issues/30343 for more details.
+      - when:
+          condition:
+            equal: [ *windows-executor, << parameters.executor >> ]
+          steps:
+            - run:
+                name: reinstall dependencies to work around cache issue (Windows only)
+                command: rm -rf node_modules && yarn
       - run:
           name: Driver memory tests in Electron
           environment:
@@ -1583,6 +1626,16 @@ jobs:
             equal: [ *darwin-arm64-executor, << parameters.executor >> ]
           steps:
             - run: rm -f /tmp/cypress/junit/*
+      # this is a temporary work around while we wait for circle to resolve issues with packages
+      # with an @ character in windows during save_cache.
+      # @see https://github.com/cypress-io/cypress/issues/30343 for more details.
+      - when:
+          condition:
+            equal: [ *windows-executor, << parameters.executor >> ]
+          steps:
+            - run:
+                name: reinstall dependencies to work around cache issue (Windows only)
+                command: rm -rf node_modules && yarn
       - run: yarn workspace @packages/server test-unit cloud/environment_spec.ts
       - verify-mocha-results:
           expectedResultCount: 1
@@ -1728,6 +1781,7 @@ jobs:
     steps:
       - run-new-ui-tests:
           browser: chrome
+          executor: << parameters.executor >>
           percy: << parameters.percy >>
           package: frontend-shared
           type: ct
@@ -1743,6 +1797,7 @@ jobs:
     steps:
       - run-new-ui-tests:
           browser: chrome
+          executor: << parameters.executor >>
           percy: << parameters.percy >>
           package: launchpad
           type: ct
@@ -1763,6 +1818,7 @@ jobs:
     steps:
       - run-new-ui-tests:
           browser: chrome
+          executor: << parameters.executor >>
           percy: << parameters.percy >>
           package: launchpad
           type: e2e
@@ -1781,6 +1837,7 @@ jobs:
     steps:
       - run-new-ui-tests:
           browser: chrome
+          executor: << parameters.executor >>
           percy: << parameters.percy >>
           package: app
           type: ct
@@ -1800,6 +1857,7 @@ jobs:
     steps:
       - run-new-ui-tests:
           browser: chrome
+          executor: << parameters.executor >>
           percy: << parameters.percy >>
           package: app
           type: e2e
@@ -1856,6 +1914,7 @@ jobs:
     steps:
       - run-new-ui-tests:
           browser: chrome
+          executor: << parameters.executor >>
           percy: << parameters.percy >>
           package: reporter
           type: ct
@@ -2138,6 +2197,16 @@ jobs:
     resource_class: << parameters.resource_class >>
     steps:
       - restore_cached_workspace
+      # this is a temporary work around while we wait for circle to resolve issues with packages
+      # with an @ character in windows during save_cache.
+      # @see https://github.com/cypress-io/cypress/issues/30343 for more details.
+      - when:
+          condition:
+            equal: [ *windows-executor, << parameters.executor >> ]
+          steps:
+            - run:
+                name: reinstall dependencies to work around cache issue (Windows only)
+                command: rm -rf node_modules && yarn
       - check-if-binary-exists
       - build-and-package-binary
       - build-cypress-npm-package:

diff --git a/browser-versions.json b/browser-versions.json
@@ -1,5 +1,5 @@
 {
   "chrome:beta": "130.0.6723.19",
-  "chrome:stable": "129.0.6668.70",
+  "chrome:stable": "129.0.6668.89",
   "chrome:minimum": "64.0.3282.0"
 }
diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md
@@ -18,6 +18,10 @@ _Released 10/1/2024 (PENDING)_
 - Cypress now consumes [geckodriver](https://firefox-source-docs.mozilla.org/testing/geckodriver/index.html) to help automate the Firefox browser instead of [marionette-client](https://github.com/cypress-io/marionette-client). Addresses [#30217](https://github.com/cypress-io/cypress/issues/30217).
 - Pass spec information to protocol's `beforeSpec` to improve troubleshooting when reporting on errors. Addressed in [#30316](https://github.com/cypress-io/cypress/pull/30316).
 
+**Dependency Updates:**
+
+- Updated `simple-git` from `3.16.0` to `3.25.0`. Addressed in [#30076](https://github.com/cypress-io/cypress/pull/30076).
+
 ## 13.15.0
 
 _Released 9/25/2024_

diff --git a/packages/data-context/package.json b/packages/data-context/package.json
@@ -51,7 +51,7 @@
     "randomstring": "1.3.0",
     "react-docgen": "6.0.4",
     "semver": "7.3.2",
-    "simple-git": "3.16.0",
+    "simple-git": "3.25.0",
     "stringify-object": "^3.0.0",
     "underscore.string": "^3.3.6",
     "wonka": "^4.0.15"

diff --git a/packages/data-context/test/unit/sources/GitDataSource.spec.ts b/packages/data-context/test/unit/sources/GitDataSource.spec.ts
@@ -216,75 +216,6 @@ describe('GitDataSource', () => {
     expect(errorStub).to.be.callCount(1)
   })
 
-  context('Git hashes', () => {
-    let clock: sinon.SinonFakeTimers
-
-    beforeEach(() => {
-      clock = sinon.useFakeTimers()
-    })
-
-    afterEach(() => {
-      clock.restore()
-    })
-
-    it('loads git hashes when first loaded', async () => {
-      const dfd = pDefer()
-
-      gitInfo = new GitDataSource({
-        isRunMode: false,
-        projectRoot: projectPath,
-        onBranchChange: sinon.stub(),
-        onGitInfoChange: sinon.stub(),
-        onError: sinon.stub(),
-        onGitLogChange: dfd.resolve,
-      })
-
-      await dfd.promise
-
-      expect(gitInfo.currentHashes).to.have.length(1)
-
-      expect(gitInfo.currentCommitInfo).to.exist
-      expect(gitInfo.currentCommitInfo.message).to.eql('add all specs')
-      expect(gitInfo.currentCommitInfo.hash).to.exist
-    })
-
-    it('detects change in hashes after a commit', async () => {
-      const dfd = pDefer()
-      const afterCommit = pDefer()
-
-      const logCallback = sinon.stub()
-
-      logCallback.onFirstCall().callsFake(dfd.resolve)
-      logCallback.onSecondCall().callsFake(afterCommit.resolve)
-
-      gitInfo = new GitDataSource({
-        isRunMode: false,
-        projectRoot: projectPath,
-        onBranchChange: sinon.stub(),
-        onGitInfoChange: sinon.stub(),
-        onError: sinon.stub(),
-        onGitLogChange: logCallback,
-      })
-
-      await dfd.promise
-
-      expect(gitInfo.currentHashes).to.have.length(1)
-
-      const afterCommitSpec = toPosix(path.join(e2eFolder, 'afterCommit.cy.js'))
-
-      await fs.createFile(afterCommitSpec)
-
-      git.add(afterCommitSpec)
-      git.commit('add afterCommit spec')
-
-      await clock.tickAsync(60010)
-
-      await afterCommit.promise
-
-      expect(gitInfo.currentHashes).to.have.length(2)
-    })
-  })
-
   context('Git Hashes - no fake timers', () => {
     it('does not include commits that are part of the Git tree from a merge', async () => {
       const dfd = pDefer()