From 8c34fd0c17c84dd1b513a9bd350b418796dbbc28 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Mar 2024 12:56:37 +0100
Subject: [PATCH 1/2] chore(deps): bump ip from 2.0.0 to 2.0.1 (#7114)

Bumps [ip](https://github.com/indutny/node-ip) from 2.0.0 to 2.0.1.
- [Commits](https://github.com/indutny/node-ip/compare/v2.0.0...v2.0.1)

---
updated-dependencies:
- dependency-name: ip
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5090e3e4739b..1b47706f2b7a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16401,9 +16401,9 @@
       }
     },
     "node_modules/ip": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz",
-      "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz",
+      "integrity": "sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ=="
     },
     "node_modules/ipaddr.js": {
       "version": "2.1.0",

From 67bf737e161658d4e8286a045a9b1b0140a1e761 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= <viktor@szepe.net>
Date: Tue, 5 Mar 2024 16:18:16 +0100
Subject: [PATCH 2/2] Move if-s to job-level in CI (#7033)

---
 .github/workflows/nodejs.yml | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index b929e258fafc..03bc174cb0d5 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -28,37 +28,31 @@ jobs:
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
         node-version: [18.x, 20.x]
+    if: ${{ needs.changes.outputs.cms == 'true' }}
     steps:
       - uses: actions/checkout@v3
-        if: ${{ needs.changes.outputs.cms == 'true' }}
       - name: Use Node.js {{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
           check-latest: true
-        if: ${{ needs.changes.outputs.cms == 'true' }}
       - name: log versions
         run: node --version && npm --version && yarn --version
-        if: ${{ needs.changes.outputs.cms == 'true' }}
       - name: install dependecies
         run: npm install
-        if: ${{ needs.changes.outputs.cms == 'true' }}
       - name: run unit tests
         run: npm run test:ci
         env:
           CI: true
           NODE_OPTIONS: --max-old-space-size=4096
-        if: ${{ needs.changes.outputs.cms == 'true' }}
       - name: build demo site
         run: npm run build:demo
         env:
           NODE_OPTIONS: --max-old-space-size=4096
-        if: ${{ needs.changes.outputs.cms == 'true' }}
       - uses: actions/upload-artifact@master
         with:
           name: dev-test-website-${{ runner.os }}-${{ matrix.node-version }}
           path: dev-test
-        if: ${{ needs.changes.outputs.cms == 'true' }}
 
   e2e-with-cypress:
     needs: [changes, build]
@@ -69,27 +63,24 @@ jobs:
         node-version: [18.x, 20.x]
       fail-fast: false
 
+    if: ${{ needs.changes.outputs.cms == 'true' }}
     steps:
       - uses: actions/checkout@v3
-        if: ${{ needs.changes.outputs.cms == 'true' }}
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
           check-latest: true
-        if: ${{ needs.changes.outputs.cms == 'true' }}
       - uses: actions/download-artifact@master
         with:
           name: dev-test-website-${{ runner.os }}-18.x
           path: dev-test
-        if: ${{ needs.changes.outputs.cms == 'true' }}
       - name: npm install
         run: |
           node --version
           npm --version
           yarn --version
           npm install
-        if: ${{ needs.changes.outputs.cms == 'true' }}
       - name: e2e test
         run: |
           npm run test:e2e:run-ci
@@ -99,9 +90,8 @@ jobs:
           NODE_OPTIONS: --max-old-space-size=4096
           MACHINE_COUNT: 2
           MACHINE_INDEX: ${{ matrix.node-version }}
-        if: ${{ needs.changes.outputs.cms == 'true' }}
       - uses: actions/upload-artifact@v3
-        if: ${{ always() && needs.changes.outputs.cms == 'true' }}
+        if: ${{ always() }}
         with:
           name: cypress-results-${{ matrix.node-version }}
           path: |