Skip to content

Fix sentry recipe when release_path no longer exists #4266

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
mrhackcz wants to merge 1 commit into
base: master
Choose a base branch
from
+30 −11
Open

Fix sentry recipe when release_path no longer exists #4266

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
41 changes: 30 additions & 11 deletions contrib/sentry.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,19 +184,38 @@ static function (&$value) use ($config) {
},
);

function getPreviousReleasePath(): ?string
{
// Set by `deploy:release` when running as part of a deployment.
if (has('previous_release')) {
return get('previous_release');
}

// Standalone run (e.g. `dep deploy:sentry`): the newest release is the current
// one, so the previous one is the second in the list.
$releasesList = get('releases_list');
if (isset($releasesList[1])) {
return parse("{{deploy_path}}/releases/{$releasesList[1]}");
}

return null;
}

function getPreviousReleaseRevision(): ?string
{
$previousReleasePath = getPreviousReleasePath();

switch (get('update_code_strategy')) {
case 'local_archive':
case 'archive':
if (has('previous_release')) {
return run('cat {{previous_release}}/REVISION');
if ($previousReleasePath !== null) {
return trim(run("cat $previousReleasePath/REVISION"));
}

return null;
case 'clone':
if (has('previous_release')) {
cd('{{previous_release}}');
if ($previousReleasePath !== null) {
cd($previousReleasePath);
return trim(run('git rev-parse HEAD'));
}

Expand All @@ -211,10 +230,10 @@ function getCurrentReleaseRevision(): string
switch (get('update_code_strategy')) {
case 'local_archive':
case 'archive':
return run('cat {{release_path}}/REVISION');
return run('cat {{release_or_current_path}}/REVISION');

case 'clone':
cd('{{release_path}}');
cd('{{release_or_current_path}}');
return trim(run('git rev-parse HEAD'));

default:
Expand All @@ -230,7 +249,7 @@ function getReleaseGitRef(): Closure
if ($strategy === 'archive') {
cd('{{deploy_path}}/.dep/repo');
} else {
cd('{{release_path}}');
cd('{{release_or_current_path}}');
}

if (isset($config['git_version_command'])) {
Expand Down Expand Up @@ -261,13 +280,13 @@ function getGitCommitsRefs(): Closure
if (get('update_code_strategy') === 'archive') {
cd('{{deploy_path}}/.dep/repo');
} else {
cd('{{release_path}}');
cd('{{release_or_current_path}}');
}

$result = run(sprintf('git rev-list --pretty="%s" %s', 'format:%H#%an#%ae#%at#%s', $commitRange));
// limit number of commits for first release with many commits
$result = run(sprintf('git rev-list --max-count=200 --pretty="%s" %s', 'format:%H#%an#%ae#%at#%s', $commitRange));
$lines = array_filter(
// limit number of commits for first release with many commits
array_map('trim', array_slice(explode("\n", $result), 0, 200)),
array_map('trim', explode("\n", $result)),
static function (string $line): bool {
return !empty($line) && strpos($line, 'commit') !== 0;
},
Expand Down
Loading