Skip to content

Commit

Permalink
TERA-1747: Try to get automerge working
Browse files Browse the repository at this point in the history
  • Loading branch information
benjamin-wiffen committed Dec 6, 2024
1 parent 63f7e5b commit fd2d905
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: Run pytest unit tests.

# Trigger condition.
on: [push]
on: [push, pull_request]

# Pipeline steps.
jobs:
Expand Down
12 changes: 4 additions & 8 deletions renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,8 @@
"timezone": "Australia/Sydney",

// Update rules.
"prCreation": "auto",
"automerge": false, //true
"automergeType": "pr",

// Post-update testing.
"postUpgradeTasks": {
"commands": ["make test"]
}
"prCreation": "status-success",
"automerge": true,
// Do not merge major updates.
"matchUpdateTypes": ["minor", "patch", "pin", "digest"],
}

0 comments on commit fd2d905

Please sign in to comment.