Skip to content

Commit f383d1e

Browse files
committed
Merge branch 'feature/hotfix-branch'
Merge details: commit a9c3395 Author: Jelle Sebreghts <sebreghts.jelle@gmail.com> Date: Tue Aug 20 14:43:38 2024 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.
2 parents b47febc + a9c3395 commit f383d1e

1 file changed

Lines changed: 15 additions & 2 deletions

File tree

.github/workflows/drupal-update.yml

Lines changed: 15 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
@@ -61,6 +62,17 @@ jobs:
6162
uses: actions/checkout@v4
6263
with:
6364
ref: ${{ inputs.branch }}
65+
fetch-depth: 0
66+
67+
- name: 'Get Previous tag'
68+
id: previoustag
69+
uses: "WyriHaximus/github-action-get-previous-tag@v1"
70+
71+
- name: 'Get next minor version'
72+
id: semvers
73+
uses: "WyriHaximus/github-action-next-semvers@v1"
74+
with:
75+
version: ${{ steps.previoustag.outputs.tag }}
6476

6577
- name: Set composer auth JSON
6678
id: auth-json
@@ -180,8 +192,9 @@ jobs:
180192
committer: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
181193
author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
182194
signoff: false
183-
branch: feature/dependency-updates
184-
delete-branch: true
195+
branch: hotfix/${{ steps.semvers.outputs.patch }}
196+
base: ${{ inputs.branch }}
197+
delete-branch: false
185198
title: Update modules
186199
body: |
187200
${{ steps.composer-update.outputs.commit_body }}

0 commit comments

Comments
 (0)