This repository has been archived by the owner on Dec 27, 2020. It is now read-only.

Commit checker always expect origin/master, even for non master PRs #29

Closed

glx22 opened this issue Mar 8, 2019 · 3 comments

Labels

bug good first issue

Contributor

glx22 commented Mar 8, 2019

For backports we open PRs against origin/release/XXX but commit checker assumes origin/master, and fails.

TrueBrain added bug good first issue labels

Member

TrueBrain commented Mar 9, 2019

Two possible solutions I can think of:

Assume we use Azure Pipelines, and check for the "System.PullRequest.TargetBranch" variable to know the tracking branch.
allow an optional additional parameter with the tracking branch, and set that via the CI.

Most likely the second is nicer.

TrueBrain mentioned this issue

Fix: rebase to 1.9 branch for backport PRs OpenTTD/OpenTTD#7346

Closed

Contributor Author

glx22 commented Mar 9, 2019

In Azure Pipelines docker task parameters for run command there is

`envVars`Environment variables	(Optional) Environment variables for the Docker container. Specify each name-value pair on a new line.

So second solution should not be too difficult. And maybe SYSTEM_PULLREQUEST_TARGETBRANCH is already passed without needing to use envVars parameter.

Member

TrueBrain commented Mar 9, 2019

No clue what I was smocking earlier today, but I think it would be good if these Dockers don't know about Azure. But yeah, mapping the variable in via env is fine. Extra parameter, env variable .. tomato tomato :)

glx22 added a commit to glx22/CompileFarm that referenced this issue


          Fix OpenTTD#29: don't assume master as target branch

853ad17

TrueBrain closed this as completed in

a65d03f

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.