mirrors/insomnia
1
0
Fork 0
mirror of https://github.com/Kong/insomnia synced 2024-11-07 22:30:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add git merge info to release-build. (#4628)

Browse Source 
* Add git merge info to release-build.

* Improve spacing
This commit is contained in:
Filipe Freire 2022-03-24 12:20:24 +00:00 committed by GitHub
parent 36644c5a8b
commit d0d86f9bc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/changelog.yml vendored
View File

@ -77,7 +77,6 @@ jobs:
OWNER: ${{ github.repository_owner }}
HEAD: release/${{ env.RELEASE_VERSION }}
RELEASE_NAME: ${{ env.RELEASE_VERSION }}
SHOW_MISSING: ${{ env.SHOW_MISSING }}
- name: Read changelog
id: read-changelog

18
.github/workflows/release-build.yml vendored
View File

@ -139,5 +139,23 @@ jobs:
```bash
gh workflow run release-publish.yml -f version=${{ steps.release_version.outputs.version }} --repo ${{ github.repository }}
```
<details>
<summary>Conflicts? Merge branch step failed on the publish workflow? Try this...</summary>
Run locally:
```bash
# Make sure git remote is Kong/insomnia...
git checkout develop
git merge --no-ff release/<replaced with version>
# Solve merge conflicts ...
# If there's package-lock conflicts, run `npm run bootstrap` and commit the package-lock changes
git push
```
</details>
destination_branch: develop
github_token: ${{ secrets.GITHUB_TOKEN }}