diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index 4087e342d3a7..e33926623de0 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -20,6 +20,10 @@ _Released 03/15/2023_ - Fixed a regression in Cypress [10](https://docs.cypress.io/guides/references/changelog#10-0-0) where the reporter auto-scroll configuration inside user preferences was unintentionally being toggled off. User's must now explicitly enable/disable auto-scroll under user preferences, which is enabled by default. Fixes [#24171](https://github.com/cypress-io/cypress/issues/24171) and [#26113](https://github.com/cypress-io/cypress/issues/26113). +**Misc:** + +- Capture the [Buildkite](https://buildkite.com/) CI provider's environment variable `BUILDKITE_RETRY_COUNT` to handle CI retries in the Cloud. Addressed in [25750](https://github.com/cypress-io/cypress/pull/25750). + **Dependency Updates:** - Upgraded [`ejs`](https://www.npmjs.com/package/ejs) from `3.1.6` to `3.1.8` to address this [CVE-2022-29078](https://github.com/advisories/GHSA-phwq-j96m-2c2q) NVD security vulnerability. Addressed in [#25279](https://github.com/cypress-io/cypress/pull/25279). diff --git a/packages/server/lib/util/ci_provider.js b/packages/server/lib/util/ci_provider.js index b280e49ddb0d..26729c4f9f3a 100644 --- a/packages/server/lib/util/ci_provider.js +++ b/packages/server/lib/util/ci_provider.js @@ -194,6 +194,7 @@ const _providerCiParams = () => { 'BUILDKITE_PULL_REQUEST', 'BUILDKITE_PULL_REQUEST_REPO', 'BUILDKITE_PULL_REQUEST_BASE_BRANCH', + 'BUILDKITE_RETRY_COUNT', ]), circle: extract([ 'CIRCLE_JOB', diff --git a/packages/server/test/unit/util/ci_provider_spec.js b/packages/server/test/unit/util/ci_provider_spec.js index 139ffe2afab8..0103012752b4 100644 --- a/packages/server/test/unit/util/ci_provider_spec.js +++ b/packages/server/test/unit/util/ci_provider_spec.js @@ -298,6 +298,7 @@ describe('lib/util/ci_provider', () => { BUILDKITE_PULL_REQUEST: 'buildkitePullRequest', BUILDKITE_PULL_REQUEST_REPO: 'buildkitePullRequestRepo', BUILDKITE_PULL_REQUEST_BASE_BRANCH: 'buildkitePullRequestBaseBranch', + BUILDKITE_RETRY_COUNT: 'buildkiteRetryCount', BUILDKITE_COMMIT: 'buildKiteCommit', BUILDKITE_BRANCH: 'buildKiteBranch', @@ -311,6 +312,7 @@ describe('lib/util/ci_provider', () => { expectsCiParams({ buildkiteRepo: 'buildkiteRepo', buildkiteJobId: 'buildkiteJobId', + buildkiteRetryCount: 'buildkiteRetryCount', buildkiteSource: 'buildkiteSource', buildkiteBuildId: 'buildkiteBuildId', buildkiteBuildUrl: 'buildkiteBuildUrl',