Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow running a build from a repo with only one commit when not in CI #812

Merged
merged 7 commits into from
Sep 6, 2023
Merged

Allow running a build from a repo with only one commit when not in CI #812

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3cbe8fa
Only warn about single commit outside of CI
tmeasday Sep 6, 2023
74b08f9
7.1.0-canary.0
tmeasday Sep 6, 2023
2a4723b
7.1.0-canary.1
tmeasday Sep 6, 2023
653eee2
7.1.0-canary.2
tmeasday Sep 6, 2023
f4047f5
7.1.0-canary.3
tmeasday Sep 6, 2023
29be461
7.1.0-canary.4
tmeasday Sep 6, 2023
4bed9fe
Fix tests
tmeasday Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions node-src/git/getCommitAndBranch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ interface CommitInfo {
}

export default async function getCommitAndBranch(
{ log },
{ log, options },
{
branchName,
patchBaseRef,
Expand Down Expand Up @@ -50,14 +50,20 @@ export default async function getCommitAndBranch(
CHROMATIC_PULL_REQUEST_SHA,
CHROMATIC_SLUG,
} = process.env;
const { isCi, service, prBranch, branch: ciBranch, commit: ciCommit, slug: ciSlug } = envCi();

const isFromEnvVariable = CHROMATIC_SHA && CHROMATIC_BRANCH; // Our GitHub Action also sets these
const isTravisPrBuild = TRAVIS_EVENT_TYPE === 'pull_request';
const isGitHubAction = GITHUB_ACTIONS === 'true';
const isGitHubPrBuild = GITHUB_EVENT_NAME === 'pull_request';

if (!(await hasPreviousCommit())) {
throw new Error(gitOneCommit(isGitHubAction));
const message = gitOneCommit(isGitHubAction);
if (isCi) {
throw new Error(message);
} else {
log.warn(message);
}
}

if (isFromEnvVariable) {
Expand Down Expand Up @@ -117,7 +123,6 @@ export default async function getCommitAndBranch(
slug = GITHUB_REPOSITORY;
}

const { isCi, service, prBranch, branch: ciBranch, commit: ciCommit, slug: ciSlug } = envCi();
const ciService = process.env.CHROMATIC_ACTION ? 'chromaui/action' : service;
slug = slug || ciSlug;

Expand Down
Loading