robojerk/codeql-action

Remove an extraneous commit during the release process

Browse source 
We only need to run `git commit` after the `git merge` call if there were conflicts.
This commit is contained in:
Henry Mercer 2022-05-11 10:50:13 +01:00 • committed by GitHub
parent 75b4f1c466
commit 3bb6c41212
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/update-release-branch.py vendored
View file

@ -292,7 +292,7 @@ def main():
conflicted_files = run_git('diff', '--name-only', '--diff-filter', 'U').splitlines()
if len(conflicted_files) > 0:
run_git('add', '.')
run_git('commit', '--no-edit')
run_git('commit', '--no-edit')
# Migrate the package version number from a v2 version number to a v1 version number
print(f'Setting version number to {version}')