Skip to content

update github package to 12.x #188

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

Merged
maclover7 merged 2 commits into from
Jul 19, 2018
Merged

update github package to 12.x #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24b12fc
add package-lock.json
Trott Jul 11, 2018
5fcf7ee
update github package to 12.x
Trott Jul 11, 2018
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
8 changes: 5 additions & 3 deletions lib/node-repo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ function resolveLabelsThenUpdatePr (options) {
return options.logger.error(err, 'Error retrieving files from GitHub')
}

const filepathsChanged = res.map((fileMeta) => fileMeta.filename)
const filepathsChanged = res.data.map((fileMeta) => fileMeta.filename)
const resolvedLabels = resolveLabels(filepathsChanged, options.baseBranch)

fetchExistingThenUpdatePr(options, resolvedLabels)
Expand Down Expand Up @@ -111,6 +111,7 @@ function fetchExistingLabels (options, cb) {
return cb(err)
}

existingLabels = existingLabels.data || existingLabels || []
const existingLabelNames = existingLabels.map((label) => label.name)

// cache labels so we don't have to fetch these *all the time*
Expand All @@ -129,11 +130,12 @@ function fetchLabelPages (options, startPageNum, cb) {
repo: options.repo,
page: startPageNum,
per_page: 100
}, (err, existingLabels) => {
}, (err, res) => {
const existingLabels = res.data || []
if (err) {
return cb(err)
}
if (!githubClient.hasNextPage(existingLabels)) {
if (!githubClient.hasNextPage(res)) {
return cb(null, existingLabels)
}
fetchLabelPages(
Expand Down
5 changes: 3 additions & 2 deletions lib/push-jenkins-update.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,13 @@ function findLatestCommitInPr (options, cb, pageNumber = 1) {
number: options.pr,
page: pageNumber,
per_page: 100
}, (err, commitMetas) => {
}, (err, res) => {
const commitMetas = res.data || []
if (err) {
return cb(err)
}

const lastPageURL = githubClient.hasLastPage(commitMetas)
const lastPageURL = githubClient.hasLastPage(res)
if (lastPageURL) {
return findLatestCommitInPr(options, cb, pageNumberFromURL(lastPageURL))
}
Expand Down
Loading