Skip to content

Commit 2d5d66b

Browse files
committed
Added test
1 parent fab5218 commit 2d5d66b

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

22/windows-2022/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ ENV NODE_CHECKSUM 3fc638727974262b4f65a6b1b43c22fb2d80671cdcb50e1237e0b05d1330aa
1313

1414
ENV GPG_VERSION 2.4.5_20240307
1515

16+
ENV GPG_TTY dwufhwuhf
17+
1618
RUN Invoke-WebRequest $('https://www.gnupg.org/ftp/gcrypt/binary/gnupg-w32-{0}.exe' -f $env:GPG_VERSION) -OutFile 'gpg-installer.exe'; \
1719
Start-Process -FilePath 'gpg-installer.exe' -ArgumentList '/S' -Wait; \
1820
Remove-Item gpg-installer.exe -Force; \

genMatrix.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@ const getNodeVersionDirs = (base) => getChildDirectories(base)
2424

2525
// Returns the paths of Dockerfiles that are at: base/*/Dockerfile
2626
const 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

3429
const 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) => {
7671
const 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

Comments
 (0)