Skip to content

Fix: Robust deployment regression protection using ancestry check #950

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

Open
AronNovak wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −7
Open

Fix: Robust deployment regression protection using ancestry check #950

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 10 additions & 7 deletions robo-components/DeploymentTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,15 +284,18 @@ public function deployPantheon(string $branch_name = 'master', ?string $commit_m
$current_version = trim($result->getMessage());

if (!empty($currently_deployed_version)) {
$result = $this
->taskExec('git cat-file -t ' . $currently_deployed_version)
// Check if the currently deployed version is an ancestor of the current version.
// This returns exit code 0 if it is an ancestor, 1 if not, and 128 if the object is missing.
// In any case other than 0, we must not deploy to prevent regression.
$is_ancestor = $this->taskExec("git merge-base --is-ancestor $currently_deployed_version $current_version")
->printOutput(FALSE)
->run();
->run()
->getExitCode() === 0;

if ($result->getMessage() !== 'commit') {
$this->yell(strtr('This current commit @current-commit cannot be deployed, as new commits have been created since, so we don\'t want to deploy an older version. Result was: @result', [
'@current-commit' => $current_version,
'@result' => $result->getMessage(),
if (!$is_ancestor) {
$this->yell(strtr('The currently deployed version (@deployed) is not an ancestor of the current version (@current). Aborting the process to avoid going back in time.', [
'@deployed' => $currently_deployed_version,
'@current' => $current_version,
]));
throw new \Exception('Aborting the process to avoid going back in time.');
}
Expand Down