ci: fix automerge for yarn repo - #278
Merged
Merged
Conversation
The automerge workflow calls the shared salesforcecli/github-workflows automerge, which defaulted to npm caching (package-lock.json) and merge commits. This repo uses yarn and a branch ruleset that only allows squash/rebase, so every scheduled run failed at setup-node and the merge step. Pass yarn/yarn.lock and mergeMethod: squash.
|
This PR lacks any commits of the 'fix' or 'feat' type, and therefore will not trigger a release. To silence all further warnings, react to this warning comment (or any other) with the 👀 emoji. NOTE: If your repo uses squash commits, make sure to add the appropriate conventional commit prefix (e.g., 'fix:', 'feat:', 'chore:', etc) in the squash commit message. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
The scheduled
automergeworkflow has been failing every run (see recent failure emails). It calls the sharedsalesforcecli/github-workflows/.github/workflows/automerge.yml@main, which:setup-nodecaching to npm (cache-dependency-path: package-lock.json). This repo is yarn — nopackage-lock.json— so setup-node dies withSome specified paths were not resolved, unable to cache dependenciesin ~5s, before the merge step ever runs.mergeMethod: merge. This repo's branch ruleset only allows squash/rebase, so even a fixed cache would fail at merge.Fix
Pass the shared workflow's existing inputs:
package-manager: yarncache-dependency-path: yarn.lockmergeMethod: squashNo fork/pin — keeps receiving upstream fixes.
Effect
Restores unattended automerge of dependabot PRs, stopping the manual approve/
--adminmerges and the failed-run emails.[skip-validate-pr]