Skip to content

Commit 23d3efd

Browse files
authored
meta: align renovate config with main repo (#702)
1 parent d3ae7c9 commit 23d3efd

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

.github/workflows/draft.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ on:
33
pull_request:
44
branches:
55
- main
6+
push:
7+
branches:
8+
- renovate/** # support automergeType=branch
69

710
# This configuration cancels previous runs if a new run is started on the same PR. Only one run at a time per PR.
811
# From https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#example-using-a-fallback-value
@@ -25,7 +28,7 @@ jobs:
2528
- run: yarn sync
2629
- run: yarn build
2730
- name: Deploy to Draft to Netlify
28-
if: '! github.event.pull_request.head.repo.fork'
31+
if: ${{ !github.event.pull_request.head.repo.fork && !startsWith(github.ref, 'refs/heads/renovate') }}
2932
id: deployment
3033
env:
3134
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
@@ -35,20 +38,20 @@ jobs:
3538
netlify deploy --dir build --message '${{ github.event.commits[0].message }}' > log.tmp.txt 2>&1
3639
cat log.tmp.txt | grep -E 'Website draft URL:' > log.txt
3740
- name: Read deployment log
38-
if: '! github.event.pull_request.head.repo.fork'
41+
if: ${{ !github.event.pull_request.head.repo.fork && !startsWith(github.ref, 'refs/heads/renovate') }}
3942
id: logs
4043
uses: juliangruber/read-file-action@v1
4144
with:
4245
path: log.txt
4346
- name: Comment PR with draft publish logs
44-
if: '! github.event.pull_request.head.repo.fork'
47+
if: ${{ !github.event.pull_request.head.repo.fork && !startsWith(github.ref, 'refs/heads/renovate') }}
4548
id: create-comment
4649
uses: peter-evans/create-or-update-comment@v4
4750
with:
4851
issue-number: ${{ github.event.pull_request.number }}
4952
body: |
5053
${{ steps.logs.outputs.content }}
5154
- name: Comment debug
52-
if: '! github.event.pull_request.head.repo.fork'
55+
if: ${{ !github.event.pull_request.head.repo.fork && !startsWith(github.ref, 'refs/heads/renovate') }}
5356
run: |
5457
echo "Comment ID - ${{ steps.create-comment.outputs.comment-id }}"

renovate.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
":semanticCommitScopeDisabled"
77
],
88
"automergeStrategy": "squash",
9+
"automergeType": "branch",
910
"semanticCommitType": "meta",
1011
"ignorePaths": ["static/"],
1112
"packageRules": [

0 commit comments

Comments
 (0)