From aba493cf2b7c68710ab28503b853bd4d23d3201c Mon Sep 17 00:00:00 2001 From: Mike McCready <66998419+MikeMcC399@users.noreply.github.com> Date: Mon, 16 Dec 2024 12:29:59 +0100 Subject: [PATCH 1/2] Use cypress/browsers Docker image short-form tag in examples --- docs/app/continuous-integration/aws-codebuild.mdx | 4 ++-- .../app/continuous-integration/bitbucket-pipelines.mdx | 4 ++-- docs/app/continuous-integration/github-actions.mdx | 2 +- docs/app/continuous-integration/gitlab-ci.mdx | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/app/continuous-integration/aws-codebuild.mdx b/docs/app/continuous-integration/aws-codebuild.mdx index 423cc4c502..4a54c7cd3f 100644 --- a/docs/app/continuous-integration/aws-codebuild.mdx +++ b/docs/app/continuous-integration/aws-codebuild.mdx @@ -132,14 +132,14 @@ version: 0.2 ## https://docs.aws.amazon.com/codebuild/latest/userguide/batch-build-buildspec.html ## Define build to run using the -## "cypress/browsers:node-22.11.0-chrome-130.0.6723.69-1-ff-132.0-edge-130.0.2849.56-1" image +## "cypress/browsers:22.12.0" image ## from the Cypress Amazon ECR Public Gallery batch: fast-fail: false build-list: - identifier: cypress-e2e-tests env: - image: public.ecr.aws/cypress-io/cypress/browsers:node-22.11.0-chrome-130.0.6723.69-1-ff-132.0-edge-130.0.2849.56-1 + image: public.ecr.aws/cypress-io/cypress/browsers:22.12.0 phases: install: diff --git a/docs/app/continuous-integration/bitbucket-pipelines.mdx b/docs/app/continuous-integration/bitbucket-pipelines.mdx index 052610f2c8..ec034fae37 100644 --- a/docs/app/continuous-integration/bitbucket-pipelines.mdx +++ b/docs/app/continuous-integration/bitbucket-pipelines.mdx @@ -59,7 +59,7 @@ example, this allows us to run the tests in Firefox by passing the Read about [Cypress docker variants](/app/continuous-integration/overview#Cypress-Docker-variants) to decide which image is best for your project. ```yaml title="bitbucket-pipelines.yml" -image: cypress/browsers:node-22.11.0-chrome-130.0.6723.69-1-ff-132.0-edge-130.0.2849.56-1 +image: cypress/browsers:22.12.0 pipelines: default: @@ -87,7 +87,7 @@ Artifacts from a job can be defined by providing paths to the `artifacts` attribute. ```yaml title="bitbucket-pipelines.yml" -image: cypress/browsers:node-22.11.0-chrome-130.0.6723.69-1-ff-132.0-edge-130.0.2849.56-1 +image: cypress/browsers:22.12.0 pipelines: default: diff --git a/docs/app/continuous-integration/github-actions.mdx b/docs/app/continuous-integration/github-actions.mdx index fa921cbefa..38ad72674f 100644 --- a/docs/app/continuous-integration/github-actions.mdx +++ b/docs/app/continuous-integration/github-actions.mdx @@ -182,7 +182,7 @@ jobs: cypress-run: runs-on: ubuntu-22.04 container: - image: cypress/browsers:node-22.11.0-chrome-130.0.6723.69-1-ff-132.0-edge-130.0.2849.56-1 + image: cypress/browsers:22.12.0 options: --user 1001 steps: - name: Checkout diff --git a/docs/app/continuous-integration/gitlab-ci.mdx b/docs/app/continuous-integration/gitlab-ci.mdx index 40f6a977e3..e5f5a916ec 100644 --- a/docs/app/continuous-integration/gitlab-ci.mdx +++ b/docs/app/continuous-integration/gitlab-ci.mdx @@ -68,7 +68,7 @@ stages: - test test: - image: cypress/browsers:node-22.11.0-chrome-130.0.6723.69-1-ff-132.0-edge-130.0.2849.56-1 + image: cypress/browsers:22.12.0 stage: test script: # install dependencies @@ -99,7 +99,7 @@ cache: - .npm/ test: - image: cypress/browsers:node-22.11.0-chrome-130.0.6723.69-1-ff-132.0-edge-130.0.2849.56-1 + image: cypress/browsers:22.12.0 stage: test script: # install dependencies @@ -166,7 +166,7 @@ cache: ## Install npm dependencies and Cypress install: - image: cypress/browsers:node-22.11.0-chrome-130.0.6723.69-1-ff-132.0-edge-130.0.2849.56-1 + image: cypress/browsers:22.12.0 stage: build script: - npm ci @@ -211,13 +211,13 @@ cache: ## Install npm dependencies and Cypress install: - image: cypress/browsers:node-22.11.0-chrome-130.0.6723.69-1-ff-132.0-edge-130.0.2849.56-1 + image: cypress/browsers:22.12.0 stage: build script: - npm ci ui-chrome-tests: - image: cypress/browsers:node-22.11.0-chrome-130.0.6723.69-1-ff-132.0-edge-130.0.2849.56-1 + image: cypress/browsers:22.12.0 stage: test parallel: 5 script: From 9ca83debd4398e808930bdc716b659664c0cf3df Mon Sep 17 00:00:00 2001 From: Mike McCready <66998419+MikeMcC399@users.noreply.github.com> Date: Mon, 16 Dec 2024 13:41:17 +0100 Subject: [PATCH 2/2] update cypress/base to 22.12.0 --- docs/accessibility/results-api.mdx | 4 ++-- docs/app/continuous-integration/bitbucket-pipelines.mdx | 4 ++-- docs/ui-coverage/results-api.mdx | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/accessibility/results-api.mdx b/docs/accessibility/results-api.mdx index c26a1680a9..a571e82249 100644 --- a/docs/accessibility/results-api.mdx +++ b/docs/accessibility/results-api.mdx @@ -288,7 +288,7 @@ run-cypress: pipeline { agent { docker { - image 'cypress/base:latest' + image 'cypress/base:22.12.0' } } @@ -359,7 +359,7 @@ version: 2.1 jobs: linux-test: docker: - - image: cypress/base:latest + - image: cypress/base:22.12.0 working_directory: ~/repo steps: diff --git a/docs/app/continuous-integration/bitbucket-pipelines.mdx b/docs/app/continuous-integration/bitbucket-pipelines.mdx index ec034fae37..186bed9811 100644 --- a/docs/app/continuous-integration/bitbucket-pipelines.mdx +++ b/docs/app/continuous-integration/bitbucket-pipelines.mdx @@ -151,7 +151,7 @@ recording test results to [Cypress Cloud](/cloud/get-started/introduction). ::: ```yaml title="bitbucket-pipelines.yml" -image: cypress/base:22.11.0 +image: cypress/base:22.12.0 ## job definition for running E2E tests in parallel e2e: &e2e @@ -210,7 +210,7 @@ definitions: The complete `bitbucket-pipelines.yml` is below: ```yaml title="bitbucket-pipelines.yml" -image: cypress/base:22.11.0 +image: cypress/base:22.12.0 ## job definition for running E2E tests in parallel e2e: &e2e diff --git a/docs/ui-coverage/results-api.mdx b/docs/ui-coverage/results-api.mdx index 3e6abe454f..2c080833ea 100644 --- a/docs/ui-coverage/results-api.mdx +++ b/docs/ui-coverage/results-api.mdx @@ -252,7 +252,7 @@ run-cypress: pipeline { agent { docker { - image 'cypress/base:latest' + image 'cypress/base:22.12.0' } } @@ -323,7 +323,7 @@ version: 2.1 jobs: linux-test: docker: - - image: cypress/base:latest + - image: cypress/base:22.12.0 working_directory: ~/repo steps: