Skip to content

Fix commit status update for UI Review when using --skip #474

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

Merged
ghengeveld merged 7 commits into from
Jan 18, 2022
Merged

Fix commit status update for UI Review when using --skip #474

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bf243c9
Send `branch` when skipping
tmeasday Dec 10, 2021
81b56ba
Also send slug
tmeasday Dec 20, 2021
428cd1e
Merge branch 'main' into send-branch-with-skip
ghengeveld Dec 21, 2021
6345afc
Actually send `slug`
tmeasday Jan 13, 2022
844ddf9
6.4.0-canary.0
tmeasday Jan 17, 2022
561f6be
Merge branch 'main' into send-branch-with-skip
ghengeveld Jan 17, 2022
93a4245
Merge branch 'main' into send-branch-with-skip
ghengeveld Jan 18, 2022
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
8 changes: 4 additions & 4 deletions bin-src/tasks/gitInfo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import invalidChangedFiles from '../ui/messages/warnings/invalidChangedFiles';
import isRebuild from '../ui/messages/warnings/isRebuild';

const TesterSkipBuildMutation = `
mutation TesterSkipBuildMutation($commit: String!) {
skipBuild(commit: $commit)
mutation TesterSkipBuildMutation($commit: String!, $branch: String, $slug: String) {
skipBuild(commit: $commit, branch: $branch, slug: $slug)
}
`;

Expand Down Expand Up @@ -54,15 +54,15 @@ export const setGitInfo = async (ctx, task) => {
ctx.git.slug = ctx.git.slug.replace(/[^/]+/, ctx.options.ownerName);
}

const { branch, commit } = ctx.git;
const { branch, commit, slug } = ctx.git;

const matchesBranch = (glob) => (glob && glob.length ? picomatch(glob)(branch) : !!glob);
ctx.git.matchesBranch = matchesBranch;

if (matchesBranch(ctx.options.skip)) {
transitionTo(skippingBuild)(ctx, task);
// The SkipBuildMutation ensures the commit is tagged properly.
if (await ctx.client.runQuery(TesterSkipBuildMutation, { commit })) {
if (await ctx.client.runQuery(TesterSkipBuildMutation, { commit, branch, slug })) {
ctx.skip = true;
transitionTo(skippedForCommit, true)(ctx, task);
setExitCode(ctx, exitCodes.OK);
Expand Down