Skip to content
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

Jump to bottom

fix(integ-runner): update workflow error message is inaccurate #27924

Merged
merged 4 commits into from
Nov 10, 2023
Merged

fix(integ-runner): update workflow error message is inaccurate #27924

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f90c86c
fix(integ-runner): update workflow error message is inaccurate
mrgrain Nov 10, 2023
0c53bc4
Merge branch 'main' into mrgrain/chore/integ-runner-better-error
mrgrain Nov 10, 2023
b2e7426
minor doc improvement
mrgrain Nov 10, 2023
e4d33d2
typo
mrgrain Nov 10, 2023
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
5 changes: 3 additions & 2 deletions packages/@aws-cdk/integ-runner/lib/runner/integ-test-runner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,9 @@ export class IntegTestRunner extends IntegRunner {
});
} catch (e) {
logger.warning('%s\n%s',
`Could not checkout snapshot directory ${this.snapshotDir} using these commands: `,
`git merge-base HEAD ${baseBranch} && git checkout {merge-base} -- ${relativeSnapshotDir}`,
`Could not checkout snapshot directory '${this.snapshotDir}'. Please verify the following command completes correctly:`,
`git checkout $(git merge-base HEAD ${baseBranch}) -- ${relativeSnapshotDir}`,
'',
);
logger.warning('error: %s', e);
}
Expand Down
Loading