From d65ff5f96ea871c62d65837c7e138915716e01a5 Mon Sep 17 00:00:00 2001 From: Brandy Smith <6577830+brandyscarney@users.noreply.github.com> Date: Wed, 11 Nov 2026 15:29:01 -0500 Subject: [PATCH 1/3] chore(ci): run every job on node 26 and name the test jobs by os --- .github/workflows/CI.yml | 16 +++++----------- package-lock.json | 16 ++++++++-------- package.json | 2 +- renovate.json | 4 ++-- 4 files changed, 16 insertions(+), 22 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index eeb78f8..989ba55 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -15,7 +15,7 @@ jobs: steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - - name: Use Node.js 24 + - name: Use Node.js 26 uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0 with: node-version: 26 @@ -25,24 +25,18 @@ jobs: run: npm run lint test: - name: Test on node ${{ matrix.node_version }} and ${{ matrix.os }} + name: Test on ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: matrix: - # When node version is updated, update the version in the GitHub repository settings (admin access required): - # Branches -> Edit `main` -> Protect matching branches -> - # Require status checks to pass before merging -> - # Search for the new version -> Add them to the list -> - # Remove the old version from the list -> Save changes - node_version: [24] os: [windows-latest, macOS-latest] steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - - name: Use Node.js ${{ matrix.node_version }} + - name: Use Node.js 26 uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0 with: - node-version: ${{ matrix.node_version }} + node-version: 26 - name: Install Dependencies run: npm ci - name: Build @@ -56,7 +50,7 @@ jobs: steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - - name: Use Node.js 24 + - name: Use Node.js 26 uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0 with: node-version: 26 diff --git a/package-lock.json b/package-lock.json index 384fd24..55194e5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,7 +36,7 @@ "@testing-library/dom": "^10.4.2", "@testing-library/jest-dom": "^7.0.0", "@testing-library/react": "^16.3.3", - "@types/node": "^24.19.2", + "@types/node": "^26.6.6", "@types/react": "^19.2.0", "@types/react-dom": "^19.2.0", "@vitejs/plugin-react": "^6.0.0", @@ -1671,13 +1671,13 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "24.19.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-24.19.2.tgz", - "integrity": "sha512-93d49wCWJkCyN87MxLpNN6KXPCwFw7bVUg79mGUV1OS40JGWwVCr8n61DXCSqz7CV6/VfPkb7xec7uP2M+QHWQ==", + "version": "26.6.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-26.6.6.tgz", + "integrity": "sha512-MzQj+8Kx3XI40OmUAE6Qoh58ZMNstNNMwn2nfd3qWsfe7nDNSqJNzes4njhz6AHwrSHOffSLwXU6yb474Q4aog==", "dev": true, "license": "MIT", "dependencies": { - "undici-types": ">=7.24.0 <7.24.7" + "undici-types": "~8.9.0" } }, "node_modules/@types/react": { @@ -5411,9 +5411,9 @@ } }, "node_modules/undici-types": { - "version": "7.24.6", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.24.6.tgz", - "integrity": "sha512-WRNW+sJgj5OBN4/0JpHFqtqzhpbnV0GuB+OozA9gCL7a993SmU+1JBZCzLNxYsbMfIeDL+lTsphD5jN5N+n0zg==", + "version": "8.9.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-8.9.0.tgz", + "integrity": "sha512-KTDyRTYX8sWmKXAikPHHSyc63CRPETMctyjKFupcC6OBLXT3xsN0e9aF7m+mIXutFWpUXuedtowG7iLOzp0kQg==", "dev": true, "license": "MIT" }, diff --git a/package.json b/package.json index d37bfac..0e6b4dd 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "@testing-library/dom": "^10.4.2", "@testing-library/jest-dom": "^7.0.0", "@testing-library/react": "^16.3.3", - "@types/node": "^24.19.2", + "@types/node": "^26.6.6", "@types/react": "^19.2.0", "@types/react-dom": "^19.2.0", "@vitejs/plugin-react": "^6.0.0", diff --git a/renovate.json b/renovate.json index 15d216b..a4e8c4b 100644 --- a/renovate.json +++ b/renovate.json @@ -63,8 +63,8 @@ }, { "matchPackageNames": ["@types/node"], - "allowedVersions": "<25", - "description": "Keep Node's types on the major version CI runs (24)" + "allowedVersions": "<27", + "description": "Keep Node's types on the major version CI runs (26)" }, { "matchPackageNames": ["typescript"], From 6d4b8bde9839fa05023faa169f0bf8c4257b4949 Mon Sep 17 00:00:00 2001 From: Brandy Smith <6577830+brandyscarney@users.noreply.github.com> Date: Wed, 11 Nov 2026 15:41:04 -0500 Subject: [PATCH 2/3] chore(ci): read the node version from .nvmrc and let renovate update @types/node --- .github/workflows/CI.yml | 12 ++++++------ .github/workflows/capacitor-sync.yml | 4 ++-- .nvmrc | 1 + renovate.json | 5 ----- 4 files changed, 9 insertions(+), 13 deletions(-) create mode 100644 .nvmrc diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 989ba55..149859f 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -15,10 +15,10 @@ jobs: steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - - name: Use Node.js 26 + - name: Set up Node.js uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0 with: - node-version: 26 + node-version-file: .nvmrc - name: Install Dependencies run: npm ci - name: Lint @@ -33,10 +33,10 @@ jobs: steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - - name: Use Node.js 26 + - name: Set up Node.js uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0 with: - node-version: 26 + node-version-file: .nvmrc - name: Install Dependencies run: npm ci - name: Build @@ -50,10 +50,10 @@ jobs: steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - - name: Use Node.js 26 + - name: Set up Node.js uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0 with: - node-version: 26 + node-version-file: .nvmrc - name: Install Dependencies run: npm ci - name: Install Playwright Browsers diff --git a/.github/workflows/capacitor-sync.yml b/.github/workflows/capacitor-sync.yml index 345953f..9c02db7 100644 --- a/.github/workflows/capacitor-sync.yml +++ b/.github/workflows/capacitor-sync.yml @@ -26,10 +26,10 @@ jobs: with: ref: ${{ github.ref_name }} token: ${{ secrets.IONITRON_GITHUB_TOKEN }} - - name: Configure Node + - name: Set up Node.js uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0 with: - node-version: 26 + node-version-file: .nvmrc - name: Install Dependencies run: npm ci - name: Build diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 0000000..6f4247a --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +26 diff --git a/renovate.json b/renovate.json index a4e8c4b..2dc5792 100644 --- a/renovate.json +++ b/renovate.json @@ -61,11 +61,6 @@ ], "groupName": "dev-tools" }, - { - "matchPackageNames": ["@types/node"], - "allowedVersions": "<27", - "description": "Keep Node's types on the major version CI runs (26)" - }, { "matchPackageNames": ["typescript"], "allowedVersions": "<6.0.0", From 2c05ff7d6a90ae66723cbb7b9a62c182b822892a Mon Sep 17 00:00:00 2001 From: Brandy Smith <6577830+brandyscarney@users.noreply.github.com> Date: Wed, 11 Nov 2026 16:05:55 -0500 Subject: [PATCH 3/3] chore(ci): cancel outdated runs when a pull request is updated --- .github/workflows/CI.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 149859f..f652e1f 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -6,6 +6,11 @@ name: Install Dependencies, Lint, Build and Test on: [pull_request] +# Cancel a pull request's in-progress run when a newer commit is pushed. +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: lint: name: Lint