@@ -24,11 +24,6 @@ const getNodeVersionDirs = (base) => getChildDirectories(base)
2424
2525// Returns the paths of Dockerfiles that are at: base/*/Dockerfile
2626const getDockerfilesInChildDirs = ( base ) => getChildDirectories ( base )
27- . map ( ( childDir ) => {
28- console . log ( `Checking ${ childDir } ` ) ;
29- return childDir ;
30- } )
31- . filter ( ( directory ) => ! windowsDirRegex . test ( path . basename ( directory ) ) )
3227 . map ( ( childDir ) => path . resolve ( childDir , 'Dockerfile' ) ) ;
3328
3429const getAllDockerfiles = ( base ) => getNodeVersionDirs ( base ) . flatMap ( getDockerfilesInChildDirs ) ;
@@ -46,7 +41,7 @@ const getAffectedDockerfiles = (filesAdded, filesModified, filesRenamed) => {
4641 return getAllDockerfiles ( __dirname ) ;
4742 }
4843
49- const modifiedDockerfiles = files . filter ( ( file ) => file . endsWith ( '/Dockerfile' ) && ! windowsDirRegex . test ( path . dirname ( file ) ) ) ;
44+ const modifiedDockerfiles = files . filter ( ( file ) => file . endsWith ( '/Dockerfile' ) ) ;
5045
5146 // Get Dockerfiles affected by modified docker-entrypoint.sh files
5247 const entrypointAffectedDockerfiles = files
@@ -76,7 +71,8 @@ const getDockerfileMatrixEntry = (file) => {
7671const generateBuildMatrix = ( filesAdded , filesModified , filesRenamed ) => {
7772 const dockerfiles = [ ...new Set ( getAffectedDockerfiles ( filesAdded , filesModified , filesRenamed ) ) ] ;
7873
79- const entries = dockerfiles . map ( getDockerfileMatrixEntry ) ;
74+ let entries = dockerfiles . map ( getDockerfileMatrixEntry ) ;
75+ entries = entries . filter ( ( entry ) => ! windowsDirRegex . test ( entry . variant ) ) ;
8076
8177 // Return null if there are no entries so we can skip the matrix step
8278 return entries . length
0 commit comments