From 1db1627068e3336f7b8d593cac6817b8ea2c1035 Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Thu, 30 Oct 2025 09:12:45 -0400 Subject: [PATCH 1/5] chore: remove unused ubuntu anchors and test publish binary against ubuntu 24 and debian 13 (trixie) --- .circleci/src/pipeline/@pipeline.yml | 4 +--- .circleci/src/pipeline/workflows/@main.yml | 2 +- scripts/binary/trigger-publish-binary-pipeline.js | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.circleci/src/pipeline/@pipeline.yml b/.circleci/src/pipeline/@pipeline.yml index 06ed4596341..3886ef54588 100644 --- a/.circleci/src/pipeline/@pipeline.yml +++ b/.circleci/src/pipeline/@pipeline.yml @@ -13,8 +13,6 @@ base-internal-yarn-berry: &base-internal-yarn-berry cypress/base-internal:22.19. # Lowest Node.js version we support of the minimum major version supported # See https://docs.cypress.io/app/get-started/install-cypress#Nodejs base-internal-minimum-node: &base-internal-minimum-node cypress/base-internal:20.15.0 -ubuntu-2004-current: &ubuntu-2004-current ubuntu-2004:2024.11.1 -ubuntu-2004-older: &ubuntu-2004-older ubuntu-2004:2024.05.1 orbs: browser-tools: circleci/browser-tools@2.3.1 @@ -118,7 +116,7 @@ commands: name: Set environment variable to determine whether or not to persist artifacts command: | echo "Setting SHOULD_PERSIST_ARTIFACTS variable" - echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "chore/fix_builds" ]]; then + echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "chore/remove_unused_anchors" ]]; then export SHOULD_PERSIST_ARTIFACTS=true fi' >> "$BASH_ENV" # You must run `setup_should_persist_artifacts` command and be using bash before running this command diff --git a/.circleci/src/pipeline/workflows/@main.yml b/.circleci/src/pipeline/workflows/@main.yml index 0cafc25ffb2..5418026c925 100644 --- a/.circleci/src/pipeline/workflows/@main.yml +++ b/.circleci/src/pipeline/workflows/@main.yml @@ -4,7 +4,7 @@ linux-x64: - 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: [ 'ryanm/fix/issue-with-sourcemaps', << pipeline.git.branch >> ] + - equal: [ 'chore/remove_unused_anchors', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> diff --git a/scripts/binary/trigger-publish-binary-pipeline.js b/scripts/binary/trigger-publish-binary-pipeline.js index 05908c2c6d9..d1c36589063 100644 --- a/scripts/binary/trigger-publish-binary-pipeline.js +++ b/scripts/binary/trigger-publish-binary-pipeline.js @@ -11,7 +11,7 @@ const { getNextVersionForBinary } = require('../get-next-version') const body = JSON.stringify({ // This branch is the branch of the `cypress-publish-binary` repository - // branch: 'main', + branch: 'chore/update_images', parameters: { temp_dir: os.tmpdir(), sha: process.env.CIRCLE_SHA1, From 876ef3a8f09d896c3e67f12086dbd8e2a44069e3 Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Thu, 30 Oct 2025 16:50:33 -0400 Subject: [PATCH 2/5] chore: empty commit to run CI From b2ee9d05a99ed1e2d183a26bc0973dbc46a2bd3f Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Thu, 30 Oct 2025 17:09:40 -0400 Subject: [PATCH 3/5] remove trixie postfix --- .circleci/src/pipeline/@pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/src/pipeline/@pipeline.yml b/.circleci/src/pipeline/@pipeline.yml index 3886ef54588..2e202b510a0 100644 --- a/.circleci/src/pipeline/@pipeline.yml +++ b/.circleci/src/pipeline/@pipeline.yml @@ -9,7 +9,7 @@ chrome-stable-version: &chrome-stable-version "141.0.7390.107" chrome-beta-version: &chrome-beta-version "142.0.7444.34" firefox-stable-version: &firefox-stable-version "142.0" base-internal-trixie: &base-internal-trixie cypress/base-internal:22.19.0-trixie -base-internal-yarn-berry: &base-internal-yarn-berry cypress/base-internal:22.19.0-yarn-berry-trixie +base-internal-yarn-berry: &base-internal-yarn-berry cypress/base-internal:22.19.0-yarn-berry # Lowest Node.js version we support of the minimum major version supported # See https://docs.cypress.io/app/get-started/install-cypress#Nodejs base-internal-minimum-node: &base-internal-minimum-node cypress/base-internal:20.15.0 From 0a01ef77a7141330c224278b08c18c2866495b44 Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Thu, 30 Oct 2025 18:57:54 -0400 Subject: [PATCH 4/5] correctly discover arm64 job as the name has now changed --- scripts/binary/get-published-artifacts.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/binary/get-published-artifacts.js b/scripts/binary/get-published-artifacts.js index 94ab1c82239..a88dc9900fd 100644 --- a/scripts/binary/get-published-artifacts.js +++ b/scripts/binary/get-published-artifacts.js @@ -12,6 +12,10 @@ const getArtifactJobName = (platformKey) => { return 'linux-amd-publish-binary' } + if (platformKey === 'linux-arm64') { + return 'linux-arm64-publish-binary' + } + return 'publish-binary' } From 21cefe7de5d386145ad7bd261d518633e991daf7 Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Fri, 31 Oct 2025 11:17:12 -0400 Subject: [PATCH 5/5] remove branch build --- scripts/binary/trigger-publish-binary-pipeline.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/binary/trigger-publish-binary-pipeline.js b/scripts/binary/trigger-publish-binary-pipeline.js index d1c36589063..05908c2c6d9 100644 --- a/scripts/binary/trigger-publish-binary-pipeline.js +++ b/scripts/binary/trigger-publish-binary-pipeline.js @@ -11,7 +11,7 @@ const { getNextVersionForBinary } = require('../get-next-version') const body = JSON.stringify({ // This branch is the branch of the `cypress-publish-binary` repository - branch: 'chore/update_images', + // branch: 'main', parameters: { temp_dir: os.tmpdir(), sha: process.env.CIRCLE_SHA1,