Merge branch 'main' into renovate/node-25.x

Update node Docker tag to v25
2026-03-26 21:50:57 +00:00 · 2026-03-26 16:00:45 +00:00
3 changed files with 3 additions and 3 deletions
--- a/.github/workflows/web-deploy-nonprod.yml
+++ b/.github/workflows/web-deploy-nonprod.yml
@ -50,7 +50,7 @@ jobs:
    needs: check-inputs
    if: needs.check-inputs.result == 'success' && inputs.workflow_type != 'release'
    environment: ${{ inputs.environments }}
-    runs-on: 'nas'
+    runs-on: 'ubuntu-latest'
    permissions:
      contents: read
      packages: write
--- a/.github/workflows/web-deploy-prod.yml
+++ b/.github/workflows/web-deploy-prod.yml
@ -28,7 +28,7 @@ on:
      TEAMCITY_PASSWORD: {}
 jobs:
  check-inputs:
-    runs-on: 'nas'
+    runs-on: 'ubuntu-latest'
    environment: ${{ inputs.environments }}
    steps:
      - name: Check secrets present
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-FROM node:20-alpine
+FROM node:25-alpine

 WORKDIR /app
Author	SHA1	Message	Date
John Parkhurst	78e0ee929f	Merge branch 'main' into renovate/node-25.x Some checks failed Web Deployment Container / determine-workflow (pull_request) Successful in 2s Details Web Deployment Container / nonprod-deploy (pull_request) Failing after 46s Details Web Deployment Container / prod-deploy (pull_request) Has been skipped Details	2026-03-26 21:50:57 +00:00
Renovate Bot	bbb0cf34b5	Update node Docker tag to v25 Some checks failed Web Deployment Container / determine-workflow (pull_request) Has been cancelled Details Web Deployment Container / nonprod-deploy (pull_request) Has been cancelled Details Web Deployment Container / prod-deploy (pull_request) Has been cancelled Details	2026-03-26 16:00:45 +00:00