Could pull request testing be changed to be based on the merged result instead of the commit?

Ben_Bronson · October 6, 2021, 9:37pm

Could pull request testing be changed to be based on the merged result instead of the commit? This would save us from failures and then having to merge the target branch into the branch for the drone build.

bradrydzewski · October 6, 2021, 9:47pm

You can override the default clone logic by supplying your own custom clone image:
https://docs.drone.io/runner/docker/configuration/reference/drone-runner-clone-image/

You can therefore fork the official clone image and modify as needed:

Ben_Bronson · October 6, 2021, 9:50pm

Thank you for the quick reply

Ben_Bronson · October 6, 2021, 9:52pm

I was asking though if this would be a helpful change to the default however.

Ben_Bronson · October 6, 2021, 9:56pm

We and others would also rather stay on the official image rather than a fork so we get the regular updates from the community.

bradrydzewski · October 6, 2021, 10:01pm

I may be misunderstanding but we merge the pull request into the target branch:

github.com

drone/drone-git/blob/master/posix/clone-pull-request#L20

    
      
          	git remote add origin ${DRONE_REMOTE_URL}
          fi
          
          
set -e
          set -x
          
          
git fetch ${FLAGS} origin +refs/heads/${DRONE_COMMIT_BRANCH}:
          git checkout ${DRONE_COMMIT_BRANCH}
          
          
git fetch origin ${DRONE_COMMIT_REF}:
          git merge ${DRONE_COMMIT_SHA}

If you are asking whether or not we can use the merge ref, we moved away from using merge refs due to them being unreliable and because github considered them an undocumented, unsupported feature and asked us to refrain from using them.

Ben_Bronson · October 6, 2021, 10:17pm

Thanks for the links. OK, you are saying the code merges into the target branch and then runs on that merged result? That was all I was asking for as it doesn’t seem to be occurring on our drone instance with github since I had to manually get the latest and merge our target branch back to the pull requested branch to fix an issue with it today. I’ll have to check if our drone code is the same as the default there.