Skip to content

Add Merge-Branch script eng/scripts#31222

Merged
hallipr merged 2 commits into
mainfrom
pahallis/merge-branch
Oct 11, 2022
Merged

Add Merge-Branch script eng/scripts#31222
hallipr merged 2 commits into
mainfrom
pahallis/merge-branch

Conversation

@hallipr

@hallipr hallipr commented Sep 29, 2022

Copy link
Copy Markdown
Member

Bring the merge-branch script from spring's branch into main

@hallipr

hallipr commented Sep 29, 2022

Copy link
Copy Markdown
Member Author

overriding check enforcer as this isn't used by any pipelines

@hallipr

hallipr commented Sep 29, 2022

Copy link
Copy Markdown
Member Author

/check-enforcer override

@check-enforcer

Copy link
Copy Markdown

This pull request is protected by Check Enforcer.

What is Check Enforcer?

Check Enforcer helps ensure all pull requests are covered by at least one check-run (typically an Azure Pipeline). When all check-runs associated with this pull request pass then Check Enforcer itself will pass.

Why am I getting this message?

You are getting this message because Check Enforcer did not detect any check-runs being associated with this pull request within five minutes. This may indicate that your pull request is not covered by any pipelines and so Check Enforcer is correctly blocking the pull request being merged.

What should I do now?

If the check-enforcer check-run is not passing and all other check-runs associated with this PR are passing (excluding license-cla) then you could try telling Check Enforcer to evaluate your pull request again. You can do this by adding a comment to this pull request as follows:
/check-enforcer evaluate
Typically evaulation only takes a few seconds. If you know that your pull request is not covered by a pipeline and this is expected you can override Check Enforcer using the following command:
/check-enforcer override
Note that using the override command triggers alerts so that follow-up investigations can occur (PRs still need to be approved as normal).

What if I am onboarding a new service?

Often, new services do not have validation pipelines associated with them, in order to bootstrap pipelines for a new service, you can issue the following command as a pull request comment:
/azp run prepare-pipelines
This will run a pipeline that analyzes the source tree and creates the pipelines necessary to build and validate your pull request. Once the pipeline has been created you can trigger the pipeline using the following comment:
/azp run java - [service] - ci

# start a merge, but leave it open
Write-Verbose "git merge $SourceBranch --no-ff --no-commit"
git merge $SourceBranch --no-ff --no-commit
if ($LASTEXITCODE) { ErrorExit $LASTEXITCODE }

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit but one possibility is to rename ErrorExit to ExitIfError and do the exit code checking within the function, ditching the if blocks.

@hallipr
hallipr merged commit 6f7b298 into main Oct 11, 2022
@hallipr
hallipr deleted the pahallis/merge-branch branch October 11, 2022 17:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants