Skip to content

Commit

Permalink
fix: fix workflow on publish release
Browse files Browse the repository at this point in the history
  • Loading branch information
choffmann committed May 26, 2024
1 parent 867447e commit 3d697ac
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build-and-push-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,17 @@ jobs:
draft: false
prerelease: false

- name: Merge main into dev branch
- name: Merge main into develop branch
uses: thomaseizinger/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
head: main
base: dev
title: Merge main into dev branch
base: develop
title: Merge main into develop branch
body: |
This PR merges the main branch back into dev.
This happens to ensure that the updates that happend on the release branch, i.e. CHANGELOG and manifest updates are also present on the dev branch.
This PR merges the main branch back into develop.
This happens to ensure that the updates that happend on the release branch, i.e. CHANGELOG and manifest updates are also present on the develop branch.
- name: Checkout code
uses: actions/checkout@v4
Expand Down

0 comments on commit 3d697ac

Please sign in to comment.