Skip to content

Commit b6bc0f5

Browse files
authored
Merge branch 'develop' into astone123/fix-itgrep-trace
2 parents 3bb1471 + d355e2c commit b6bc0f5

File tree

344 files changed

+11088
-9366
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

344 files changed

+11088
-9366
lines changed

.circleci/cache-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Bump this version to force CI to re-create the cache from scratch.
2-
10-10-2025
2+
10-17-2025

.circleci/src/pipeline/@pipeline.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ version: 2.1
55
# the new location and/or names:
66
# - ./scripts/github-actions/update-browser-versions.js
77

8-
chrome-stable-version: &chrome-stable-version "140.0.7339.207"
9-
chrome-beta-version: &chrome-beta-version "141.0.7390.30"
8+
chrome-stable-version: &chrome-stable-version "141.0.7390.107"
9+
chrome-beta-version: &chrome-beta-version "142.0.7444.34"
1010
firefox-stable-version: &firefox-stable-version "142.0"
1111
base-internal-bullseye: &base-internal-bullseye cypress/base-internal:22.19.0-bullseye
1212
base-internal-yarn-berry: &base-internal-yarn-berry cypress/base-internal:22.19.0-yarn-berry
@@ -118,7 +118,7 @@ commands:
118118
name: Set environment variable to determine whether or not to persist artifacts
119119
command: |
120120
echo "Setting SHOULD_PERSIST_ARTIFACTS variable"
121-
echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "ryanm/fix/rename-exclude-from-ai" ]]; then
121+
echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "chore/fix_builds" ]]; then
122122
export SHOULD_PERSIST_ARTIFACTS=true
123123
fi' >> "$BASH_ENV"
124124
# You must run `setup_should_persist_artifacts` command and be using bash before running this command
@@ -1473,7 +1473,6 @@ jobs:
14731473
default: false
14741474
resource_class: << parameters.resource_class >>
14751475
steps:
1476-
- update_known_hosts
14771476
- checkout
14781477
- install-required-node
14791478
- verify-build-setup:
@@ -1497,9 +1496,6 @@ jobs:
14971496
resource_class:
14981497
type: string
14991498
default: large
1500-
is_contributor_pr:
1501-
type: boolean
1502-
default: false
15031499
resource_class: << parameters.resource_class >>
15041500
steps:
15051501
- restore_cached_workspace
@@ -1518,8 +1514,9 @@ jobs:
15181514
command: yarn list --depth=0 || true
15191515
- run:
15201516
name: Check env canaries
1521-
command: node ./scripts/circle-env.js --check-canaries --is-contributor-pr <<
1522-
parameters.is_contributor_pr >>
1517+
command: |
1518+
IS_CONTRIBUTOR_PR=$([[ "<< pipeline.git.branch >>" =~ ^pull/[0-9]+$ ]] && echo "true" || echo "false")
1519+
node ./scripts/circle-env.js --check-canaries --is-contributor-pr $IS_CONTRIBUTOR_PR
15231520
- build-and-persist
15241521

15251522
lint:
@@ -1787,7 +1784,7 @@ jobs:
17871784
source ./scripts/ensure-node.sh
17881785
yarn lerna run types
17891786
- sanitize-verify-and-store-mocha-results:
1790-
expectedResultCount: 8
1787+
expectedResultCount: 3
17911788

17921789
verify-release-readiness:
17931790
<<: *defaults

0 commit comments

Comments
 (0)