From db56b97952482d796e895c8851462ced6c8350f1 Mon Sep 17 00:00:00 2001 From: Cee Chen Date: Mon, 5 Feb 2024 11:46:52 -0800 Subject: [PATCH 1/3] Upgrade all node version references --- .nvmrc | 2 +- package.json | 2 +- scripts/docker-ci/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.nvmrc b/.nvmrc index d5a159609d0..8b0beab16a5 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -20.10.0 +20.11.0 diff --git a/package.json b/package.json index 532c32ece3c..975ccdfc3a2 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "main": "lib", "module": "es", "types": "eui.d.ts", - "docker_image": "20.10.0", + "docker_image": "20.11.0", "engines": { "node": "16.x || 18.x || >=20.x" }, diff --git a/scripts/docker-ci/Dockerfile b/scripts/docker-ci/Dockerfile index 93ce186bbd0..b64aeab2554 100644 --- a/scripts/docker-ci/Dockerfile +++ b/scripts/docker-ci/Dockerfile @@ -2,7 +2,7 @@ # https://github.com/zenato/docker-puppeteer/blob/master/Dockerfile # >=12.0 required (for cypress). v18 is LTS. -FROM --platform=linux/amd64 node:20.10.0-slim +FROM --platform=linux/amd64 node:20.11.0-slim SHELL ["/bin/bash", "-o", "pipefail", "-c"] From 40312c3a85ef147fdf240f4edb9d82cca1f7f836 Mon Sep 17 00:00:00 2001 From: Cee Chen Date: Mon, 5 Feb 2024 12:05:43 -0800 Subject: [PATCH 2/3] Update docker image --- .buildkite/scripts/lifecycle/pre_command.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/scripts/lifecycle/pre_command.sh b/.buildkite/scripts/lifecycle/pre_command.sh index ffaac1b0f88..32d8159e73b 100644 --- a/.buildkite/scripts/lifecycle/pre_command.sh +++ b/.buildkite/scripts/lifecycle/pre_command.sh @@ -17,7 +17,7 @@ export GCE_ACCOUNT GITHUB_TOKEN=$(retry 5 vault read -field=github_token $GITHUB_ACCOUNT) export GITHUB_TOKEN -DOCKER_BASE_IMAGE=docker.elastic.co/eui/ci:6.1 +DOCKER_BASE_IMAGE=docker.elastic.co/eui/ci:6.2 export DOCKER_BASE_IMAGE GCE_IMAGE=google/cloud-sdk:slim From 0f1ca37f66fc81a5857a31b1bf8b5a9579b9b4ed Mon Sep 17 00:00:00 2001 From: Cee Chen Date: Mon, 5 Feb 2024 13:07:04 -0800 Subject: [PATCH 3/3] Fix failing Cypress spec - not totally sure why this changed - Chrome version/scroll bar widths maybe??? --- src/components/selectable/selectable.spec.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/selectable/selectable.spec.tsx b/src/components/selectable/selectable.spec.tsx index 6c43f3a6957..f477641bbd1 100644 --- a/src/components/selectable/selectable.spec.tsx +++ b/src/components/selectable/selectable.spec.tsx @@ -298,7 +298,7 @@ describe('EuiSelectable', () => { cy.get('[data-test-subj="truncatedText"]') .first() - .should('have.text', 'Lorem ipsum …iscing elit.'); + .should('have.text', 'Lorem ipsum …piscing elit.'); }); it('correctly accounts for the keyboard focus badge', () => {