Skip to content

Commit

Permalink
Merge branch 'main' into patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
rogerluan committed Feb 18, 2021
2 parents ea9adef + 35a98bb commit 6b94685
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# .gitattributes documentation: https://git-scm.com/docs/gitattributes

# Resolve 3-way merge conflicts on the CHANGELOG.md file using the union strategy
CHANGELOG.md merge=union
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

<!-- Your comment below this -->
- Fixed Bitrise's `ciRunURL` underlying env var - [@rogerluan]
- Log failure to update status also when not in verbose mode - [@rogerluan]
<!-- Your comment above this -->

# 10.6.2
Expand Down
2 changes: 1 addition & 1 deletion source/runner/Executor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ export class Executor {
const urlForInfo = issueURL || this.ciSource.ciRunURL
const successPosting = await this.platform.updateStatus(passed, messageForResults(results), urlForInfo, dangerID)

if (!successPosting && this.options.verbose) {
if (!successPosting) {
this.log("Could not add a commit status, the GitHub token for Danger does not have access rights.")
this.log("If the build fails, then danger will use a failing exit code.")
}
Expand Down

0 comments on commit 6b94685

Please sign in to comment.