From a49d334e6436b49627a1a722d8a416169ddc138c Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Mon, 14 Aug 2023 16:20:35 +1000 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Gert Hengeveld --- node-src/lib/emailHash.ts | 1 - node-src/lib/localBuildsSpecifier.ts | 2 +- node-src/tasks/initialize.ts | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/node-src/lib/emailHash.ts b/node-src/lib/emailHash.ts index f93e79ef7..ebcca78ac 100644 --- a/node-src/lib/emailHash.ts +++ b/node-src/lib/emailHash.ts @@ -1,4 +1,3 @@ -// This is duplicated from https://github.com/chromaui/chromatic/blob/1ceabdd81936b883a2a9ddc804ed13bfa0919c47/services/index/model/lib/emailHash.ts#L1-L7 import { createHash } from 'crypto'; // Inspired by https://en.gravatar.com/site/implement/hash diff --git a/node-src/lib/localBuildsSpecifier.ts b/node-src/lib/localBuildsSpecifier.ts index 35d7e0947..5d657b5f1 100644 --- a/node-src/lib/localBuildsSpecifier.ts +++ b/node-src/lib/localBuildsSpecifier.ts @@ -4,7 +4,7 @@ import { emailHash } from './emailHash'; export function localBuildsSpecifier(ctx: Pick) { if (ctx.options.isLocalBuild) return { localBuildEmailHash: emailHash(ctx.git.gitUserEmail) }; - // For non local builds, if we have a committer hash, we want only local builds from that person + // For global builds, we only want local builds from the committer (besides global builds) if (ctx.git.committerEmail) return { localBuildEmailHash: emailHash(ctx.git.committerEmail) }; // If we don't know, we fall back to *no local builds at all* diff --git a/node-src/tasks/initialize.ts b/node-src/tasks/initialize.ts index 49f067b05..45f43524f 100644 --- a/node-src/tasks/initialize.ts +++ b/node-src/tasks/initialize.ts @@ -64,7 +64,7 @@ export const announceBuild = async (ctx: Context) => { patchBaseRef, patchHeadRef, preserveMissingSpecs, - gitUserEmailHash: emailHash(gitUserEmail), + ...(gitUserEmail && { gitUserEmailHash: emailHash(gitUserEmail) }), ...commitInfo, committedAt: new Date(committedAt), ciVariables: ctx.environment,