Skip to content

Commit 9c37ddd

Browse files
authored
chore: enable Renovate's auto-merge (#131)
Signed-off-by: Niccolò Fei <niccolo.fei@enterprisedb.com>
1 parent 146cb20 commit 9c37ddd

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

.github/workflows/continuous-delivery.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
name: continuous-delivery
22
on:
3+
pull_request:
34
workflow_dispatch:
45
inputs:
56
cnpg_branch:
@@ -80,10 +81,11 @@ jobs:
8081
revision: ${{ github.sha }}
8182
pgMajor: ${{ env.PG_MAJOR }}
8283
with:
83-
push: true
84+
push: ${{ github.event_name != 'pull_request' }}
8485

8586
# Get a list of the images that were built and pushed. We only care about a single tag for each image.
8687
- name: Generated images
88+
if: github.event_name != 'pull_request'
8789
id: images
8890
env:
8991
BUILD_METADATA: ${{ steps.build.outputs.metadata }}

renovate.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
33
"extends": [
4-
"config:recommended"
4+
"config:recommended",
5+
"docker:pinDigests",
6+
":gitSignOff",
7+
":automergeMinor",
8+
":automergeDigest"
59
],
610
"prConcurrentLimit": 5,
711
"semanticCommits": "enabled",

0 commit comments

Comments
 (0)