Merge remote-tracking branch 'origin/v0.3' into fix/2835-cicd-plan
This commit is contained in:
@@ -748,10 +748,21 @@ function serviceRuntimeConfigIdentity(deployJson, lane, serviceId) {
|
||||
healthPort: Number.isInteger(declaration.healthPort) ? declaration.healthPort : null,
|
||||
healthProbe: normalizeServiceHealthProbe(declaration.healthProbe),
|
||||
env: normalizeServiceEnv(declaration.env),
|
||||
observable: declaration.observable === true
|
||||
observable: declaration.observable === true,
|
||||
baseRuntimeService: runtimeServiceConfigById(deployJson?.services, serviceId),
|
||||
laneRuntimeService: runtimeServiceConfigById(laneConfig?.services, serviceId)
|
||||
};
|
||||
}
|
||||
|
||||
function runtimeServiceConfigById(services, serviceId) {
|
||||
if (!Array.isArray(services)) return null;
|
||||
let match = null;
|
||||
for (const service of services) {
|
||||
if (service?.serviceId === serviceId) match = service;
|
||||
}
|
||||
return match;
|
||||
}
|
||||
|
||||
export async function packageRuntimeFieldsChanged(repoRoot, baseRef, targetRef, filePath = "package.json") {
|
||||
const [before, after] = await Promise.all([
|
||||
readJsonFromGit(repoRoot, baseRef, filePath, null),
|
||||
|
||||
Reference in New Issue
Block a user