From a9332bae02a3fbb2895ed8baabeb58f1e05ccca6 Mon Sep 17 00:00:00 2001 From: Devin Smith Date: Thu, 9 Dec 2021 07:45:44 -0800 Subject: [PATCH] Check the docker registry directories for gradle.properties. Otherwise, project may become unbuildable if you check out a branch that has a new registry, and then checkout a branch that doesn't have that registry. --- settings.gradle | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/settings.gradle b/settings.gradle index efcc896247a..4f5dfa4e3da 100644 --- a/settings.gradle +++ b/settings.gradle @@ -249,9 +249,11 @@ project(':docker-java-and-python').projectDir = file('docker/java-and-python') include(':docker-runtime-base') project(':docker-runtime-base').projectDir = file('docker/runtime-base') -file("${rootDir}/docker/registry").list().each {name -> - include(":docker-${name}") - project(":docker-${name}").projectDir = file("${rootDir}/docker/registry/${name}") +file("${rootDir}/docker/registry").list().each { name -> + if (file("${rootDir}/docker/registry/${name}/gradle.properties").exists()) { + include(":docker-${name}") + project(":docker-${name}").projectDir = file("${rootDir}/docker/registry/${name}") + } } // Apply "vanity naming" (look for .gradle files matching ProjectName/ProjectName.gradle)