diff --git a/CHANGELOG.md b/CHANGELOG.md index b3a38a2c..29eeac35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,7 +22,7 @@ _None._ ### Bug Fixes -- Fix the `annotate_test_failures` to include test cases with error nodes in the failures list. [#58] +_None._ ### Internal Changes @@ -38,11 +38,11 @@ _None._ ### New Features -_None._ +- When `install_cocoapods` fails because `Podfile.lock` changed in CI, it now prints a diff of the changes [#59] ### Bug Fixes -_None._ +- Fix the `annotate_test_failures` to include test cases with error nodes in the failures list. [#58] ### Internal Changes diff --git a/bin/install_cocoapods b/bin/install_cocoapods index 980ecf32..83cb46f5 100755 --- a/bin/install_cocoapods +++ b/bin/install_cocoapods @@ -32,8 +32,20 @@ else fi function lockfile_error () { - message="\`Podfile.lock\` was changed by \`bundle exec pod install\`. Please run \`bundle exec pod install\` locally with a clean cache and commit the result." + message=$(cat <See diff + + \`\`\` + $(git diff -- Podfile.lock) + \`\`\` + +EOF + ) + echo "$message" + buildkite-agent annotate "$message" --style 'error' --context 'ctx-error' } trap lockfile_error ERR