Added windows 22

Author: zZHorizonZz

.github/workflows/build-test-windows.yml

@@ -3,25 +3,76 @@ name: build-test-windows
 on:
   push:
     paths:
-      - "**/windows/Dockerfile"
+      - "**/windows-2019/Dockerfile"
+      - "**/windows-2022/Dockerfile"
       - ".github/workflows/build-test-windows.yml"
 
   pull_request:
     paths:
-      - "**/windows/Dockerfile"
-      - genMatrix.js
+      - "**/windows-2019/Dockerfile"
+      - "**/windows-2022/Dockerfile"
       - ".github/workflows/build-test-windows.yml"
 
 jobs:
-  build:
-    name: build
+  build-windows-2019:
+    name: build-windows-2019
     runs-on: windows-2019
     timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix: 
-        version: [ 22 ]
-        variant: [ "windows" ]
+        version: [ "22.7.0" ]
+        variant: [ "windows-2019" ]
+
+    steps:
+      - name: Get short node version
+        uses: actions/github-script@v7
+        id: short-version
+        with:
+          result-encoding: string
+          script: return "${{ matrix.version }}".split('.')[0]
+
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Build image
+        run: |
+          docker build --file ./${{ steps.short-version.outputs.result }}/${{ matrix.variant }}/Dockerfile --tag node:${{ matrix.version }}-${{ matrix.variant }} .
+
+      - name: Test for node version
+        shell: pwsh
+        run: |
+          $image_node_version = (docker run --rm node:${{ matrix.version }}-${{ matrix.variant }} node --print "process.versions.node")
+          Write-Host "Expected: '${{ matrix.version }}', Got: '$image_node_version'"
+          if ($image_node_version -ne ${{ matrix.version }}) {
+            exit 1 
+          }
+        
+      - name: Verify entrypoint runs regular, non-executable files with node
+        shell: pwsh
+        run: |
+          $tmp_file = New-TemporaryFile
+          "console.log('success')" | Out-File -FilePath $tmp_file -Encoding utf8
+          $output = (docker run --rm -v "${{ github.workspace }}\$tmp_file:/app/index.js" node:${{ matrix.version }}-${{ matrix.variant }} app/index.js)
+          if ($output -ne 'success') {
+            exit 1
+          }
+        
+      - name: Test for npm
+        run: docker run --rm node:${{ matrix.version }}-${{ matrix.variant }} npm --version
+        
+      - name: Test for yarn
+        run: docker run --rm node:${{ matrix.version }}-${{ matrix.variant }} yarn --version
+
+  build-windows-2022:
+    name: build-windows-2022
+    runs-on: windows-2022
+    timeout-minutes: 60
+    strategy:
+      fail-fast: false
+      matrix: 
+        version: [ "22.7.0" ]
+        variant: [ "windows-2022" ]
 
     steps:
       - name: Get short node version

22/windows/Dockerfile 22/windows-2019/Dockerfile22/windows/Dockerfile renamed to 22/windows-2019/Dockerfile

@@ -0,0 +1,48 @@
+FROM mcr.microsoft.com/windows/servercore:ltsc2022
+
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+# PATH isn't actually set in the Docker image, so we have to set it from within the container
+RUN $newPath = ('C:\nodejs;{0}\Yarn\bin;{1}' -f $env:LOCALAPPDATA, $env:PATH); \
+	Write-Host ('Updating PATH: {0}' -f $newPath); \
+	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine)
+# doing this first to share cache across versions more aggressively
+
+ENV NODE_VERSION 22.7.0
+ENV NODE_SHA256 3fc638727974262b4f65a6b1b43c22fb2d80671cdcb50e1237e0b05d1330aaf7
+
+RUN $url = ('https://nodejs.org/dist/v{0}/node-v{0}-win-x64.zip' -f $env:NODE_VERSION); \
+	Write-Host ('Downloading {0} ...' -f $url); \
+	Invoke-WebRequest -Uri $url -OutFile 'node.zip'; \
+	\
+	Write-Host ('Verifying sha256 ({0}) ...' -f $env:NODE_SHA256); \
+	if ((Get-FileHash node.zip -Algorithm sha256).Hash -ne $env:NODE_SHA256) { throw 'SHA256 mismatch' }; \
+	\
+	Write-Host 'Expanding ...'; \
+	Expand-Archive node.zip -DestinationPath C:\; \
+	\
+	Write-Host 'Renaming ...'; \
+	Rename-Item -Path ('C:\node-v{0}-win-x64' -f $env:NODE_VERSION) -NewName 'C:\nodejs'; \
+	\
+	Write-Host 'Removing ...'; \
+	Remove-Item node.zip -Force; \
+	\
+	Write-Host 'Verifying ("node --version") ...'; \
+	node --version; \
+	Write-Host 'Verifying ("npm --version") ...'; \
+	npm --version; \
+	\
+	Write-Host 'Complete.'
+
+ENV YARN_VERSION 1.22.17
+
+# "It is recommended to install Yarn through the npm package manager" (https://classic.yarnpkg.com/en/docs/install)
+RUN Write-Host 'Installing "yarn" ...'; \
+	npm install --global ('yarn@{0}' -f $env:YARN_VERSION); \
+	\
+	Write-Host 'Verifying ("yarn --version") ...'; \
+	yarn --version; \
+	\
+	Write-Host 'Complete.'
+
+CMD [ "node" ]