I'm trying to find out the best way to do the following: Let's say we have 2 branches - develop and master after a push in 'develop' I want to trigger a CI\CD job, and it's working fine but the tricky part is to do same thing for the 'master branch' I mean, after the 'develop' branch finished and merged the changes into master. Shouldn't the Webhook consider that as a 'push' and activate the CI again?
So just to be clear, the webhook is only working for the 'develop' ci\cd job and not continuing to 'master'. (working actions are in bold) push to 'develop' -> trigger CI --> if pass trigger CD --> if pass trigger CI for 'master'
you can set up your webhook to trigger the CI/CD job for the 'master' branch when changes are merged from 'develop' to 'master'. This can be achieved by configuring the webhook to listen to the 'push' event on the 'master' branch.
Here's how you can configure this:
Configure the webhook to listen to 'push' events on the 'develop' branch.
In your CI/CD job for the 'develop' branch, add a step to merge changes into the 'master' branch.
Configure the webhook to listen to 'push' events on the 'master' branch as well.
In your CI/CD job for the 'master' branch, add a step to build and deploy the changes.
This way, when changes are pushed to the 'develop' branch, the webhook will trigger the CI/CD job for the 'develop' branch. After the changes are merged into the 'master' branch, the webhook will trigger the CI/CD job for the 'master' branch as well.
Another way to do it, if you want better control is to use GitHub actions in the middle, and write a very simple job that triggers the webhook when ever there is push to master/develop branch.
Let me know if you want further information about the implementation of a github actions workflow.