forked from n8n-io/n8n
-
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.
disable "Merge back into master" step in the release process (no-chan…
…gelog) this doesn't work
- Loading branch information
Showing
1 changed file
with
16 additions
and
16 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 |
---|---|---|
|
@@ -128,19 +128,19 @@ jobs: | |
- name: Trigger a release note | ||
run: curl -u docsWorkflows:${{ secrets.N8N_WEBHOOK_DOCS_PASSWORD }} --request GET 'https://internal.users.n8n.cloud/webhook/trigger-release-note' --header 'Content-Type:application/json' --data '{"version":"${{ needs.publish-to-npm.outputs.release }}"}' | ||
|
||
merge-back-into-master: | ||
name: Merge back into master | ||
needs: [publish-to-npm, create-github-release] | ||
if: ${{ github.event.pull_request.merged == true && !contains(github.event.pull_request.labels.*.name, 'release:patch') }} | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/[email protected] | ||
with: | ||
fetch-depth: 0 | ||
- run: | | ||
git checkout --track origin/master | ||
git config user.name "github-actions[bot]" | ||
git config user.email 41898282+github-actions[bot]@users.noreply.github.com | ||
git merge --ff n8n@${{ needs.publish-to-npm.outputs.release }} | ||
git push origin master | ||
git push origin :${{github.event.pull_request.base.ref}} | ||
# merge-back-into-master: | ||
# name: Merge back into master | ||
# needs: [publish-to-npm, create-github-release] | ||
# if: ${{ github.event.pull_request.merged == true && !contains(github.event.pull_request.labels.*.name, 'release:patch') }} | ||
# runs-on: ubuntu-latest | ||
# steps: | ||
# - uses: actions/[email protected] | ||
# with: | ||
# fetch-depth: 0 | ||
# - run: | | ||
# git checkout --track origin/master | ||
# git config user.name "github-actions[bot]" | ||
# git config user.email 41898282+github-actions[bot]@users.noreply.github.com | ||
# git merge --ff n8n@${{ needs.publish-to-npm.outputs.release }} | ||
# git push origin master | ||
# git push origin :${{github.event.pull_request.base.ref}} |