From dc8259a52fe6c34294872ffa80c25e0b281ed852 Mon Sep 17 00:00:00 2001 From: Sagar Khalasi Date: Fri, 18 Oct 2024 17:51:26 +0530 Subject: [PATCH 1/2] Fixing chrom version --- .github/workflows/ci-test-custom-script.yml | 2 +- .github/workflows/ci-test-hosted.yml | 2 +- .github/workflows/ci-test-limited-with-count.yml | 2 +- .github/workflows/ci-test-limited.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-test-custom-script.yml b/.github/workflows/ci-test-custom-script.yml index 575110b1b825..90084b54ea9e 100644 --- a/.github/workflows/ci-test-custom-script.yml +++ b/.github/workflows/ci-test-custom-script.yml @@ -257,7 +257,7 @@ jobs: - uses: browser-actions/setup-chrome@latest with: - chrome-version: stable + chrome-version: 129 - run: | echo "BROWSER_PATH=$(which chrome)" >> $GITHUB_ENV diff --git a/.github/workflows/ci-test-hosted.yml b/.github/workflows/ci-test-hosted.yml index 6f2796c63a66..9bfef94d56e1 100644 --- a/.github/workflows/ci-test-hosted.yml +++ b/.github/workflows/ci-test-hosted.yml @@ -139,7 +139,7 @@ jobs: - uses: browser-actions/setup-chrome@latest with: - chrome-version: stable + chrome-version: 129 - run: | echo "BROWSER_PATH=$(which chrome)" >> $GITHUB_ENV diff --git a/.github/workflows/ci-test-limited-with-count.yml b/.github/workflows/ci-test-limited-with-count.yml index b7786c07aa5a..e977b7d31c42 100644 --- a/.github/workflows/ci-test-limited-with-count.yml +++ b/.github/workflows/ci-test-limited-with-count.yml @@ -234,7 +234,7 @@ jobs: - uses: browser-actions/setup-chrome@latest with: - chrome-version: stable + chrome-version: 129 - run: | echo "BROWSER_PATH=$(which chrome)" >> $GITHUB_ENV diff --git a/.github/workflows/ci-test-limited.yml b/.github/workflows/ci-test-limited.yml index b9cdeaf90f13..1a81844c5d21 100644 --- a/.github/workflows/ci-test-limited.yml +++ b/.github/workflows/ci-test-limited.yml @@ -224,7 +224,7 @@ jobs: - uses: browser-actions/setup-chrome@latest with: - chrome-version: stable + chrome-version: 129 - run: | echo "BROWSER_PATH=$(which chrome)" >> $GITHUB_ENV From 50611d659045d14604f3c5aceb59dd763c1e7bdb Mon Sep 17 00:00:00 2001 From: Sagar Khalasi Date: Wed, 23 Oct 2024 13:39:15 +0530 Subject: [PATCH 2/2] updated anvil --- app/client/cypress/Dockerfile | 10 +++------- app/client/package.json | 6 +++--- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/app/client/cypress/Dockerfile b/app/client/cypress/Dockerfile index bfcc443f79f9..bda9cb4b7f23 100644 --- a/app/client/cypress/Dockerfile +++ b/app/client/cypress/Dockerfile @@ -1,11 +1,7 @@ -#ARG CHROME_VERSION="126.0.6478.114-1" +ARG CHROME_VERSION="129.0.6668.100-1" ARG YARN_VERSION='1.22.22' ARG NODE_VERSION='20.13.1' ARG CYPRESS_VERSION='13.13.0' -FROM cypress/factory:4.0.2 +FROM --platform=linux/amd64 cypress/factory:4.0.2 -# Install chromium in this way since there is no browsers in the docker container for the arm64 architecture -# https://github.com/cypress-io/cypress-docker-images/issues/695 -RUN apt update && apt install -y chromium - -ENTRYPOINT ["yarn", "cypress:snapshot"] +ENTRYPOINT [ "yarn", "cypress:snapshot"] \ No newline at end of file diff --git a/app/client/package.json b/app/client/package.json index 3b205ee5ea81..4ad1aae098dd 100644 --- a/app/client/package.json +++ b/app/client/package.json @@ -43,9 +43,9 @@ "check-types": "yarn tsc --noEmit", "init-husky": "cd ../.. && husky install app/client/.husky", "clean:workspaces": "yarn workspaces foreach -pAv exec rm -rf node_modules", - "cypress:snapshot": "npx cypress run -b chromium -s", - "cypress:snapshot:docker": "docker run --network='host' -it --rm -e CYPRESS_$1 -v $PWD:/cypress -w /cypress cypress-snapshot $0", - "cypress:snapshot:docker:build": "docker build . -f cypress/Dockerfile -t cypress-snapshot" + "cypress:snapshot": "npx cypress run -b chrome -s", + "cypress:snapshot:docker": "DEBUG=cypress:* docker run --platform linux/amd64 --network='host' -it --rm -e CYPRESS_UPDATE_SNAPSHOTS=$1 -v $PWD:/cypress -w /cypress cypress-snapshot $0", + "cypress:snapshot:docker:build": "docker build --platform linux/amd64 . -f cypress/Dockerfile -t cypress-snapshot" }, "dependencies": { "@appsmith/ads": "workspace:^",