Skip to content

Commit 1ded77e

Browse files
authored
Update workflow
Create a hotfix branch and a pull request against master. This is safer for when there has been some work done on develop.
1 parent 6e49b28 commit 1ded77e

1 file changed

Lines changed: 14 additions & 2 deletions

File tree

.github/workflows/drupal-update.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ on:
3232
description: The branch to check for updates, defaults to the default branch
3333
required: false
3434
type: string
35+
default: master
3536
repman-host:
3637
description: The repman host for composer, if applicable
3738
required: false
@@ -167,6 +168,16 @@ jobs:
167168
- name: Remove git commit hooks
168169
if: steps.check_grumphp.outputs.files_exists == 'true'
169170
run: vendor/bin/grumphp git:deinit
171+
172+
- name: 'Get Previous tag'
173+
id: previoustag
174+
uses: "WyriHaximus/github-action-get-previous-tag@v1"
175+
176+
- name: 'Get next minor version'
177+
id: semvers
178+
uses: "WyriHaximus/github-action-next-semvers@v1"
179+
with:
180+
version: ${{ steps.previoustag.outputs.tag }}
170181

171182
- name: Create a pull request
172183
uses: peter-evans/create-pull-request@v6
@@ -180,8 +191,9 @@ jobs:
180191
committer: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
181192
author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
182193
signoff: false
183-
branch: feature/dependency-updates
184-
delete-branch: true
194+
branch: hotfix/${{ steps.semvers.outputs.patch }}
195+
base: ${{ inputs.branch }}
196+
delete-branch: false
185197
title: Update modules
186198
body: |
187199
${{ steps.composer-update.outputs.commit_body }}

0 commit comments

Comments
 (0)