Updated genmatrix

Author: zZHorizonZz

22/windows-2019/Dockerfile

@@ -3,7 +3,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2019
 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};C:\Program Files (x86)\GnuPG\bin' -f $env:LOCALAPPDATA, $env:PATH); \
+RUN $newPath = ('C:\nodejs;{0}\Yarn\bin;C:\Program Files (x86)\GnuPG\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

22/windows-2022/Dockerfile

@@ -3,7 +3,7 @@ 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};C:\Program Files (x86)\GnuPG\bin' -f $env:LOCALAPPDATA, $env:PATH); \
+RUN $newPath = ('C:\nodejs;{0}\Yarn\bin;C:\Program Files (x86)\GnuPG\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

Dockerfile-windows.template

@@ -3,7 +3,7 @@ FROM mcr.microsoft.com/windows/servercore:version
 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};C:\Program Files (x86)\GnuPG\bin' -f $env:LOCALAPPDATA, $env:PATH); \
+RUN $newPath = ('C:\nodejs;{0}\Yarn\bin;C:\Program Files (x86)\GnuPG\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

genMatrix.js

@@ -8,21 +8,28 @@ const testFiles = [
 ];
 
 const nodeDirRegex = /^\d+$/;
+// Directories starting with 'windows-' are excluded from the matrix windows-2019 are excluded for example
 const windowsDirRegex = /^windows-/;
 
 const areTestFilesChanged = (changedFiles) => changedFiles
   .some((file) => testFiles.includes(file));
 
 // Returns a list of the child directories in the given path, excluding those starting with 'windows-'
 const getChildDirectories = (parent) => fs.readdirSync(parent, { withFileTypes: true })
-  .filter((dirent) => dirent.isDirectory() && !windowsDirRegex.test(dirent.name))
+  .filter((directory) => directory.isDirectory())
   .map(({ name }) => path.resolve(parent, name));
 
 const getNodeVersionDirs = (base) => getChildDirectories(base)
   .filter((childPath) => nodeDirRegex.test(path.basename(childPath)));
 
 // Returns the paths of Dockerfiles that are at: base/*/Dockerfile
 const getDockerfilesInChildDirs = (base) => getChildDirectories(base)
+  .filter((directory) => directory.isDirectory() && !windowsDirRegex.test(directory.name))
+  // Test print the directories
+  .map((childDir) => {
+    console.log(childDir);
+    return childDir;
+  })
   .map((childDir) => path.resolve(childDir, 'Dockerfile'));
 
 const getAllDockerfiles = (base) => getNodeVersionDirs(base).flatMap(getDockerfilesInChildDirs);