Skip to content

Commit 65fb2a7

Browse files
committed
build(deps): fix dependabot automerge trigger
1 parent 506b7de commit 65fb2a7

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

.github/workflows/dependabot-auto-merge.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,34 +19,35 @@ jobs:
1919
github-token: "${{ secrets.GITHUB_TOKEN }}"
2020

2121
- name: Checkout PR branch
22-
if: steps.metadata.outputs.package-ecosystem == 'npm' && contains(steps.metadata.outputs.dependency-names, '@salesforce/source-deploy-retrieve')
22+
if: steps.metadata.outputs.package-ecosystem == 'npm_and_yarn' && contains(steps.metadata.outputs.dependency-names, '@salesforce/source-deploy-retrieve')
2323
uses: actions/checkout@v6
2424
with:
2525
ref: ${{ github.event.pull_request.head.ref }}
26+
token: ${{ secrets.RELEASE_PAT }}
2627

2728
- name: Setup Node
28-
if: steps.metadata.outputs.package-ecosystem == 'npm' && contains(steps.metadata.outputs.dependency-names, '@salesforce/source-deploy-retrieve')
29+
if: steps.metadata.outputs.package-ecosystem == 'npm_and_yarn' && contains(steps.metadata.outputs.dependency-names, '@salesforce/source-deploy-retrieve')
2930
uses: actions/setup-node@v6
3031
with:
3132
node-version: 20
3233

3334
- name: Install dependencies
34-
if: steps.metadata.outputs.package-ecosystem == 'npm' && contains(steps.metadata.outputs.dependency-names, '@salesforce/source-deploy-retrieve')
35+
if: steps.metadata.outputs.package-ecosystem == 'npm_and_yarn' && contains(steps.metadata.outputs.dependency-names, '@salesforce/source-deploy-retrieve')
3536
run: HUSKY=0 npm ci
3637

3738
- name: Build
38-
if: steps.metadata.outputs.package-ecosystem == 'npm' && contains(steps.metadata.outputs.dependency-names, '@salesforce/source-deploy-retrieve')
39+
if: steps.metadata.outputs.package-ecosystem == 'npm_and_yarn' && contains(steps.metadata.outputs.dependency-names, '@salesforce/source-deploy-retrieve')
3940
run: npm run build
4041

4142
- name: Sync internal registry with SDR
42-
if: steps.metadata.outputs.package-ecosystem == 'npm' && contains(steps.metadata.outputs.dependency-names, '@salesforce/source-deploy-retrieve')
43+
if: steps.metadata.outputs.package-ecosystem == 'npm_and_yarn' && contains(steps.metadata.outputs.dependency-names, '@salesforce/source-deploy-retrieve')
4344
run: |
4445
npm run sync:registry
4546
npm run build
4647
npm run lint:fix
4748
4849
- name: Update e2e expected files API version
49-
if: steps.metadata.outputs.package-ecosystem == 'npm' && contains(steps.metadata.outputs.dependency-names, '@salesforce/source-deploy-retrieve')
50+
if: steps.metadata.outputs.package-ecosystem == 'npm_and_yarn' && contains(steps.metadata.outputs.dependency-names, '@salesforce/source-deploy-retrieve')
5051
run: |
5152
# Extract new API version from the updated SDR
5253
NEW_VERSION=$(node -e "import('@salesforce/source-deploy-retrieve').then(m => m.getCurrentApiVersion()).then(v => process.stdout.write(v + '.0'))")
@@ -73,7 +74,7 @@ jobs:
7374
git worktree remove /tmp/e2e-head
7475
7576
- name: Commit and push if changed
76-
if: steps.metadata.outputs.package-ecosystem == 'npm' && contains(steps.metadata.outputs.dependency-names, '@salesforce/source-deploy-retrieve')
77+
if: steps.metadata.outputs.package-ecosystem == 'npm_and_yarn' && contains(steps.metadata.outputs.dependency-names, '@salesforce/source-deploy-retrieve')
7778
run: |
7879
git config user.name "github-actions[bot]"
7980
git config user.email "github-actions[bot]@users.noreply.github.com"
@@ -83,10 +84,10 @@ jobs:
8384
8485
- name: Enable auto-merge for Dependabot PRs
8586
# Only for SDR updates in npm ecosystem
86-
if: steps.metadata.outputs.package-ecosystem == 'npm' && contains(steps.metadata.outputs.dependency-names, '@salesforce/source-deploy-retrieve')
87+
if: steps.metadata.outputs.package-ecosystem == 'npm_and_yarn' && contains(steps.metadata.outputs.dependency-names, '@salesforce/source-deploy-retrieve')
8788
run: |
8889
gh pr review --approve "$PR_URL"
8990
gh pr merge --auto --squash "$PR_URL"
9091
env:
9192
PR_URL: ${{github.event.pull_request.html_url}}
92-
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
93+
GITHUB_TOKEN: ${{secrets.RELEASE_PAT}}

0 commit comments

Comments
 (0)