Skip to content

Commit

Permalink
Fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
orta committed May 11, 2018
1 parent 0495094 commit 05cd72d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@

## Master

* Adds support for the GH Checks API [notes to come][@orta][]
* JSON diffs use the JSON5 parser, so can now ignore comments in JSON etc [@orta][]

# 3.6.5

* Fix setting the status url on bitbucket [@orta][]
Expand Down
5 changes: 3 additions & 2 deletions source/platforms/git/gitJSONToGitDSL.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import * as keys from "lodash.keys"

import * as jsonDiff from "rfc6902"
import * as jsonpointer from "jsonpointer"
import * as JSON5 from "json5"

import { GitDSL, JSONPatchOperation, GitJSONDSL, StructuredDiff } from "../../dsl/GitDSL"

Expand Down Expand Up @@ -66,8 +67,8 @@ export const gitJSONToGitDSL = (gitJSONRep: GitJSONDSL, config: GitJSONToGitDSLC

// Parse JSON. `fileContents` returns empty string for files that are
// missing in one of the refs, ie. when the file is created or deleted.
const baseJSON = baseFile === "" ? {} : JSON.parse(baseFile)
const headJSON = headFile === "" ? {} : JSON.parse(headFile)
const baseJSON = baseFile === "" ? {} : JSON5.parse(baseFile)
const headJSON = headFile === "" ? {} : JSON5.parse(headFile)

// Tiny bit of hand-waving here around the types. JSONPatchOperation is
// a simpler version of all operations inside the rfc6902 d.ts. Users
Expand Down

0 comments on commit 05cd72d

Please sign in to comment.