8000 Merge pull request #3200 from github/henrymercer/backport-hotfix · github/codeql-action@2a6736c · GitHub
[go: up one dir, main page]

Skip to content

Commit 2a6736c

Browse files
authored
Merge pull request #3200 from github/henrymercer/backport-hotfix
Revert "Rebuild" commit rather than "Update dependencies"
2 parents f443b60 + c8765c9 commit 2a6736c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

.github/update-release-branch.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -371,10 +371,10 @@ def main():
371371
# releases.
372372
run_git('revert', vOlder_update_commits[0], '--no-edit')
373373

374-
# Also revert the "Update checked-in dependencies" commit created by Actions.
375-
update_dependencies_commit = run_git('log', '--grep', '^Update checked-in dependencies', '--format=%H').split()[0]
376-
print(f' Reverting {update_dependencies_commit}')
377-
run_git('revert', update_dependencies_commit, '--no-edit')
374+
# Also revert the "Rebuild" commit created by Actions.
375+
rebuild_commit = run_git('log', '--grep', '^Rebuild$', '--format=%H').split()[0]
376+
print(f' Reverting {rebuild_commit}')
377+
run_git('revert', rebuild_commit, '--no-edit')
378378

379379
else:
380380
print(' Nothing to revert.')

0 commit comments

Comments
 (0)
0