search

networkservicemesh / cmd-forwarder-vpp

Apache License 2.0
2 stars 22 forks source link

Ci/CD Automatic conflict resolving does not work #1113

Open VitalyGushin opened 4 months ago

VitalyGushin commented 4 months ago

https://github.com/networkservicemesh/cmd-forwarder-vpp/pull/1111 https://github.com/networkservicemesh/cmd-forwarder-vpp/pull/1112

NikitaSkrynnik commented 4 months ago

Another Issue

When we have conflicts in PRs ci workflow doesn't start. We should check and resolve any conflicts on PR creation. Steps:

  1. Copy check-mergeability and resolve-conflicts jobs and put them after this job
  2. Remove this condition from the copied check-mergeability job
  3. Add needs: [auto-pull-request] into conditions of the copied check-mergeability job
Ex4amp1e commented 4 months ago

Action plan

  1. Finish https://github.com/networkservicemesh/.github/pull/78
  2. Test https://github.com/networkservicemesh/cmd-forwarder-vpp/pull/1118
  3. Provide fix from [2] to https://github.com/networkservicemesh/cmd-template