Skip to content

Commit

Permalink
Merge branch 'main' into remove-actions-github
Browse files Browse the repository at this point in the history
  • Loading branch information
Uzlopak committed Oct 11, 2023
2 parents 6c9e621 + 84a893b commit 4e87813
Show file tree
Hide file tree
Showing 10 changed files with 941 additions and 113 deletions.
870 changes: 849 additions & 21 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
"@vercel/ncc": "^0.38.0",
"eslint": "^8.51.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-prettier": "^5.0.1",
"husky": "^8.0.3",
"prettier": "^2.8.8",
"prettier": "^3.0.3",
"proxyquire": "^2.1.3",
"sinon": "^16.1.0",
"tap": "^18.4.5"
Expand Down
12 changes: 6 additions & 6 deletions src/action.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ module.exports = async function run({
}) {
const { updateType } = dependabotMetadata
const dependencyNames = parseCommaOrSemicolonSeparatedValue(
dependabotMetadata.dependencyNames
dependabotMetadata.dependencyNames,
)

const {
Expand All @@ -48,7 +48,7 @@ module.exports = async function run({
if (!pull_request && !PR_NUMBER) {
core.setOutput(MERGE_STATUS_KEY, MERGE_STATUS.skippedNotADependabotPr)
return logError(
'This action must be used in the context of a Pull Request or with a Pull Request number'
'This action must be used in the context of a Pull Request or with a Pull Request number',
)
}

Expand Down Expand Up @@ -76,10 +76,10 @@ module.exports = async function run({
} catch {
core.setOutput(
MERGE_STATUS_KEY,
MERGE_STATUS.skippedCommitVerificationFailed
MERGE_STATUS.skippedCommitVerificationFailed,
)
return logWarning(
'PR contains invalid dependabot commit signatures, skipping.'
'PR contains invalid dependabot commit signatures, skipping.',
)
}
}
Expand All @@ -105,7 +105,7 @@ Tried to do a '${updateType}' update but the max allowed is '${TARGET}'`)
}

const changedExcludedPackages = EXCLUDE_PKGS.filter(
pkg => dependencyNames.indexOf(pkg) > -1
pkg => dependencyNames.indexOf(pkg) > -1,
)

// TODO: Improve error message for excluded packages?
Expand All @@ -132,7 +132,7 @@ ${changedExcludedPackages.join(', ')}. Skipping.`)
if (APPROVE_ONLY) {
core.setOutput(MERGE_STATUS_KEY, MERGE_STATUS.approved)
return logInfo(
'APPROVE_ONLY set, PR was approved but it will not be merged'
'APPROVE_ONLY set, PR was approved but it will not be merged',
)
}

Expand Down
2 changes: 1 addition & 1 deletion src/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const getMergeMethod = inputs => {

if (!mergeMethods[input]) {
logWarning(
'merge-method input is ignored because it is malformed, defaulting to `squash`.'
'merge-method input is ignored because it is malformed, defaulting to `squash`.',
)
return mergeMethods.squash
}
Expand Down
4 changes: 2 additions & 2 deletions src/verifyCommitSignatures.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ function verifyCommitSignatureCommitterAndAuthor(
sha,
author,
committer,
verified
verified,
) {
if (
!verified ||
committer.name !== dependabotCommitter ||
author.name !== dependabotAuthor
) {
throw new Error(
`Signature for commit ${sha} could not be verified - Not a dependabot commit`
`Signature for commit ${sha} could not be verified - Not a dependabot commit`,
)
}
}
Expand Down
Loading

0 comments on commit 4e87813

Please sign in to comment.