From 606e6ea42099593c12b6992d7a3d8dcba3839aa1 Mon Sep 17 00:00:00 2001 From: Ritvi Bhatt Date: Wed, 29 Jan 2025 10:49:17 -0800 Subject: [PATCH 1/3] downgrade cypress to 12.17.4 Signed-off-by: Ritvi Bhatt --- package.json | 2 +- yarn.lock | 29 +++++++++++------------------ 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index f2559dd..3c0055a 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "@testing-library/user-event": "^14.4.3", "@types/enzyme-adapter-react-16": "^1.0.6", "@types/react-test-renderer": "^18.0.0", - "cypress": "^13.6.0", + "cypress": "12.17.4", "eslint": "^6.8.0", "husky": "^8.0.3", "jest-dom": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index 76b1e44..602948a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -29,7 +29,7 @@ resolved "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz" integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== -"@cypress/request@^3.0.0": +"@cypress/request@2.88.12", "@cypress/request@^3.0.0": version "3.0.1" resolved "https://registry.yarnpkg.com/@cypress/request/-/request-3.0.1.tgz#72d7d5425236a2413bd3d8bb66d02d9dc3168960" integrity sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ== @@ -136,12 +136,10 @@ resolved "https://registry.npmjs.org/@types/node/-/node-10.12.27.tgz" integrity sha512-e9wgeY6gaY21on3ve0xAjgBVjGDWq/xUteK0ujsE53bUoxycMkqfnkUgMt6ffZtykZ5X12Mg3T7Pw4TRCObDKg== -"@types/node@^18.17.5": - version "18.19.5" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.5.tgz#4b23a9ab8ab7dafebb57bcbaf5c3d8d04f9d8cac" - integrity sha512-22MG6T02Hos2JWfa1o5jsIByn+bc5iOt1IS4xyg6OG68Bu+wMonVZzdrgCw693++rpLE9RUT/Bx15BeDzO0j+g== - dependencies: - undici-types "~5.26.4" +"@types/node@^16.18.39": + version "16.18.125" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.125.tgz#c2bfb73222c573e5906843a13db24714c21ba556" + integrity sha512-w7U5ojboSPfZP4zD98d+/cjcN2BDW6lKH2M0ubipt8L8vUC7qUAC6ENKGSJL4tEktH2Saw2K4y1uwSjyRGKMhw== "@types/prop-types@*": version "15.7.8" @@ -604,14 +602,14 @@ csstype@^3.0.2: resolved "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz" integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ== -cypress@^13.6.0: - version "13.6.2" - resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.6.2.tgz#c70df09db0a45063298b3cecba2fa21109768e08" - integrity sha512-TW3bGdPU4BrfvMQYv1z3oMqj71YI4AlgJgnrycicmPZAXtvywVFZW9DAToshO65D97rCWfG/kqMFsYB6Kp91gQ== +cypress@12.17.4: + version "12.17.4" + resolved "https://registry.yarnpkg.com/cypress/-/cypress-12.17.4.tgz#b4dadf41673058493fa0d2362faa3da1f6ae2e6c" + integrity sha512-gAN8Pmns9MA5eCDFSDJXWKUpaL3IDd89N9TtIupjYnzLSmlpVr+ZR+vb4U/qaMp+lB6tBvAmt7504c3Z4RU5KQ== dependencies: - "@cypress/request" "^3.0.0" + "@cypress/request" "2.88.12" "@cypress/xvfb" "^1.2.4" - "@types/node" "^18.17.5" + "@types/node" "^16.18.39" "@types/sinonjs__fake-timers" "8.1.1" "@types/sizzle" "^2.3.2" arch "^2.2.0" @@ -2214,11 +2212,6 @@ type-fest@^0.8.1: resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz" integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== -undici-types@~5.26.4: - version "5.26.5" - resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" - integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== - universalify@^0.2.0: version "0.2.0" resolved "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz" From 2420e6e17496b4520bb2d13ad162920265369f39 Mon Sep 17 00:00:00 2001 From: Ritvi Bhatt Date: Wed, 29 Jan 2025 12:09:41 -0800 Subject: [PATCH 2/3] update artifact action to v4 Signed-off-by: Ritvi Bhatt --- .github/workflows/cypress-e2e-sql-workbench-test.yml | 4 ++-- .github/workflows/ftr-e2e-sql-workbench-test.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cypress-e2e-sql-workbench-test.yml b/.github/workflows/cypress-e2e-sql-workbench-test.yml index 28edd22..3c2c97c 100644 --- a/.github/workflows/cypress-e2e-sql-workbench-test.yml +++ b/.github/workflows/cypress-e2e-sql-workbench-test.yml @@ -142,14 +142,14 @@ jobs: working-directory: OpenSearch-Dashboards/plugins/dashboards-query-workbench - name: Capture failure screenshots - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 if: failure() with: name: cypress-screenshots-${{ matrix.os }} path: OpenSearch-Dashboards/plugins/dashboards-query-workbench/.cypress/screenshots - name: Capture test video - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 if: failure() with: name: cypress-videos-${{ matrix.os }} diff --git a/.github/workflows/ftr-e2e-sql-workbench-test.yml b/.github/workflows/ftr-e2e-sql-workbench-test.yml index d179203..67086c4 100644 --- a/.github/workflows/ftr-e2e-sql-workbench-test.yml +++ b/.github/workflows/ftr-e2e-sql-workbench-test.yml @@ -150,14 +150,14 @@ jobs: working-directory: opensearch-dashboards-functional-test - name: Capture failure screenshots - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 if: failure() with: name: cypress-screenshots-${{ matrix.os }} path: opensearch-dashboards-functional-test/cypress/screenshots - name: Capture failure test video - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 if: failure() with: name: cypress-videos-${{ matrix.os }} From 70656505a7abd13bd4e37a228618bf932069bcff Mon Sep 17 00:00:00 2001 From: Ritvi Bhatt Date: Wed, 29 Jan 2025 12:16:56 -0800 Subject: [PATCH 3/3] update all artifact actions to v4 Signed-off-by: Ritvi Bhatt --- .github/workflows/sql-workbench-test-build-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sql-workbench-test-build-workflow.yml b/.github/workflows/sql-workbench-test-build-workflow.yml index f13c286..2ed5cb5 100644 --- a/.github/workflows/sql-workbench-test-build-workflow.yml +++ b/.github/workflows/sql-workbench-test-build-workflow.yml @@ -58,7 +58,7 @@ jobs: whoami && yarn build && mv ./build/*.zip ./build/dashboards-query-workbench.zip" - name: Upload Artifact if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: dashboards-query-workbench-ubuntu-latest path: OpenSearch-Dashboards/plugins/dashboards-query-workbench/build @@ -113,7 +113,7 @@ jobs: mv ./build/*.zip ./build/dashboards-query-workbench.zip - name: Upload Artifact if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: dashboards-query-workbench-${{ matrix.os }} path: OpenSearch-Dashboards/plugins/dashboards-query-workbench/build