-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: fix workflow on publish release
- Loading branch information
Showing
1 changed file
with
5 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
|