From 793979cf10a2af179c019d92e24e88916aacd155 Mon Sep 17 00:00:00 2001 From: ricardo-viera Date: Mon, 14 Sep 2026 09:44:25 -0600 Subject: [PATCH] ci: fix automerge for yarn repo 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. --- .github/workflows/automerge.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index cc6fceb..34190be 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -8,3 +8,10 @@ jobs: automerge: uses: salesforcecli/github-workflows/.github/workflows/automerge.yml@main secrets: inherit + with: + # This is a yarn repo: cache off yarn.lock, not the default package-lock.json, + # or setup-node fails with "Some specified paths were not resolved". + package-manager: yarn + cache-dependency-path: yarn.lock + # Branch ruleset only permits squash/rebase merges; the default 'merge' is rejected. + mergeMethod: squash