mirror/insomnia
1
0
Fork 0
mirror of https://github.com/Kong/insomnia.git synced 2026-04-21 06:37:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

enable merging git branch into develop

Browse Source
This commit is contained in:
Jay Wu
2025-02-20 18:38:40 +08:00
parent daf2626875
commit 2716b0dcce
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -256,15 +256,15 @@ jobs:
# with:
# username: ${{ (github.event_name == 'workflow_dispatch' && github.actor) || 'insomnia-infra' }}
# - name: Merge git branch into develop
# run: |
# remote_repo="https://${GITHUB_ACTOR}:${RELEASE_GH_TOKEN}@github.com/${GITHUB_REPOSITORY}.git"
# git checkout develop
# git merge --no-ff ${{ env.RELEASE_BRANCH }}
# git status
# git push "${remote_repo}"
# env:
# RELEASE_GH_TOKEN: ${{ secrets.RELEASE_GH_TOKEN }}
- name: Merge git branch into develop
run: |
remote_repo="https://${GITHUB_ACTOR}:${RELEASE_GH_TOKEN}@github.com/${GITHUB_REPOSITORY}.git"
git checkout develop
git merge --no-ff ${{ env.RELEASE_BRANCH }}
git status
git push "${remote_repo}"
env:
RELEASE_GH_TOKEN: ${{ secrets.RELEASE_GH_TOKEN }}
artifact-provenance:
needs: [publish]