From 37add77095cb93c888e6988d67373a74a90e55d0 Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Mon, 18 Dec 2023 17:58:30 +0100 Subject: [PATCH 1/3] fix(ci): ensure deploy workflow does not override benchmark data (#4376) --- .github/workflows/docs.yaml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 3c519e632e..5905b86141 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -16,7 +16,7 @@ jobs: cache: 'npm' cache-dependency-path: | package-lock.json - node-version: '18' + node-version: '20' - name: Install and Build 🔧 run: | @@ -29,8 +29,10 @@ jobs: NODE_OPTIONS: --max-old-space-size=6144 - name: Deploy Documentation 🚀 - uses: JamesIves/github-pages-deploy-action@releases/v3 + uses: JamesIves/github-pages-deploy-action@releases/v4 with: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - BRANCH: gh-pages # The branch the action should deploy to. - FOLDER: docs # The folder the action should deploy. + branch: gh-pages # The branch the action should deploy to. + folder: docs # The folder the action should deploy. + # ensure we don't override benchmark data + clean-exclude: | + benchmarks/** From 3cf2cf60c5a10ce1e4e85f850f9246e829a2c56d Mon Sep 17 00:00:00 2001 From: "C. T. Lin" Date: Tue, 19 Dec 2023 20:40:28 +0800 Subject: [PATCH 2/3] fix(instrumentation): bump import-in-the-middle to 1.7.2 (#4379) --- .../opentelemetry-instrumentation/package.json | 2 +- package-lock.json | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index 802457ecab..2db4d92158 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -72,7 +72,7 @@ }, "dependencies": { "@types/shimmer": "^1.0.2", - "import-in-the-middle": "1.7.1", + "import-in-the-middle": "1.7.2", "require-in-the-middle": "^7.1.1", "semver": "^7.5.2", "shimmer": "^1.2.1" diff --git a/package-lock.json b/package-lock.json index 490d403d43..f926ba0d83 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3105,7 +3105,7 @@ "license": "Apache-2.0", "dependencies": { "@types/shimmer": "^1.0.2", - "import-in-the-middle": "1.7.1", + "import-in-the-middle": "1.7.2", "require-in-the-middle": "^7.1.1", "semver": "^7.5.2", "shimmer": "^1.2.1" @@ -19475,9 +19475,9 @@ } }, "node_modules/import-in-the-middle": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.7.1.tgz", - "integrity": "sha512-1LrZPDtW+atAxH42S6288qyDFNQ2YCty+2mxEPRtfazH6Z5QwkaBSTS2ods7hnVJioF6rkRfNoA6A/MstpFXLg==", + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.7.2.tgz", + "integrity": "sha512-coz7AjRnPyKW36J6JX5Bjz1mcX7MX1H2XsEGseVcnXMdzsAbbAu0HBZhiAem+3SAmuZdi+p8OwoB2qUpTRgjOQ==", "dependencies": { "acorn": "^8.8.2", "acorn-import-assertions": "^1.9.0", @@ -40765,7 +40765,7 @@ "codecov": "3.8.3", "cpx": "1.5.0", "cross-var": "1.1.0", - "import-in-the-middle": "1.7.1", + "import-in-the-middle": "1.7.2", "karma": "6.4.2", "karma-chrome-launcher": "3.1.0", "karma-coverage": "2.2.1", @@ -50051,9 +50051,9 @@ } }, "import-in-the-middle": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.7.1.tgz", - "integrity": "sha512-1LrZPDtW+atAxH42S6288qyDFNQ2YCty+2mxEPRtfazH6Z5QwkaBSTS2ods7hnVJioF6rkRfNoA6A/MstpFXLg==", + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.7.2.tgz", + "integrity": "sha512-coz7AjRnPyKW36J6JX5Bjz1mcX7MX1H2XsEGseVcnXMdzsAbbAu0HBZhiAem+3SAmuZdi+p8OwoB2qUpTRgjOQ==", "requires": { "acorn": "^8.8.2", "acorn-import-assertions": "^1.9.0", From 42aaae0270aec344d22e8a0b7b3c595700fcae97 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 19 Dec 2023 20:59:34 +0100 Subject: [PATCH 3/3] chore(deps): update dependency chromedriver to v120 (#4374) --- package-lock.json | 23 ++++++++++++++++------- selenium-tests/package.json | 2 +- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index f926ba0d83..2be1e4a30c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14187,10 +14187,11 @@ } }, "node_modules/chromedriver": { - "version": "119.0.1", + "version": "120.0.0", + "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-120.0.0.tgz", + "integrity": "sha512-LGy2LhWRBiqDarFIU8gQ43EEyj+07Tc3JuUhthkESAwZ99lrifSnKZwKU0aVwansU84+k6bt71z7K3dkk65gZg==", "dev": true, "hasInstallScript": true, - "license": "Apache-2.0", "dependencies": { "@testim/chrome-version": "^1.1.4", "axios": "^1.6.0", @@ -14209,8 +14210,9 @@ }, "node_modules/chromedriver/node_modules/agent-base": { "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", "dev": true, - "license": "MIT", "dependencies": { "debug": "4" }, @@ -14220,8 +14222,9 @@ }, "node_modules/chromedriver/node_modules/https-proxy-agent": { "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", "dev": true, - "license": "MIT", "dependencies": { "agent-base": "6", "debug": "4" @@ -35481,7 +35484,7 @@ "babel-loader": "8.3.0", "babel-polyfill": "6.26.0", "browserstack-local": "1.4.8", - "chromedriver": "119.0.1", + "chromedriver": "120.0.0", "dotenv": "16.0.0", "fast-safe-stringify": "2.1.1", "geckodriver": "3.0.1", @@ -42823,7 +42826,7 @@ "babel-loader": "8.3.0", "babel-polyfill": "6.26.0", "browserstack-local": "1.4.8", - "chromedriver": "119.0.1", + "chromedriver": "120.0.0", "dotenv": "16.0.0", "fast-safe-stringify": "2.1.1", "geckodriver": "3.0.1", @@ -46508,7 +46511,9 @@ "dev": true }, "chromedriver": { - "version": "119.0.1", + "version": "120.0.0", + "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-120.0.0.tgz", + "integrity": "sha512-LGy2LhWRBiqDarFIU8gQ43EEyj+07Tc3JuUhthkESAwZ99lrifSnKZwKU0aVwansU84+k6bt71z7K3dkk65gZg==", "dev": true, "requires": { "@testim/chrome-version": "^1.1.4", @@ -46522,6 +46527,8 @@ "dependencies": { "agent-base": { "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", "dev": true, "requires": { "debug": "4" @@ -46529,6 +46536,8 @@ }, "https-proxy-agent": { "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", "dev": true, "requires": { "agent-base": "6", diff --git a/selenium-tests/package.json b/selenium-tests/package.json index c5468ef006..104b4d06f5 100644 --- a/selenium-tests/package.json +++ b/selenium-tests/package.json @@ -40,7 +40,7 @@ "babel-loader": "8.3.0", "babel-polyfill": "6.26.0", "browserstack-local": "1.4.8", - "chromedriver": "119.0.1", + "chromedriver": "120.0.0", "dotenv": "16.0.0", "fast-safe-stringify": "2.1.1", "geckodriver": "3.0.1",