Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: rebase to 1.9 branch for backport PRs #7346

Closed
wants to merge 10 commits into from
Closed

Conversation

@glx22
Copy link
Contributor

glx22 commented Mar 8, 2019

No description provided.

Copy link
Member

TrueBrain left a comment

There is a variable "System.PullRequest.TargetBranch". Possibly it is better if we pick up that variable (if it is available) to run the CI against?

(And possibly better to first do that in master; after that backport it to branch)

@TrueBrain
Copy link
Member

TrueBrain commented Mar 9, 2019

First needs fixing of OpenTTD/CompileFarm#29 btw.

@glx22
Copy link
Contributor Author

glx22 commented Mar 9, 2019

Second commit was just to check #7354 in non master, seems to be working fine

@glx22
Copy link
Contributor Author

glx22 commented Mar 9, 2019

I think this PR should be a test PR that will be closed once CI is fixed and #7354 is backported.

@TrueBrain TrueBrain dismissed their stale review Mar 9, 2019

.

@glx22
Copy link
Contributor Author

glx22 commented Mar 10, 2019

[command]/usr/bin/docker run -e TARGET_BRANCH=release/1.9 --rm -v /home/vsts/work/1/s:/home/vsts/work/1/s -w /home/vsts/work/1/s openttd/compile-farm-ci:commit-checker
Now just need CompileFarm fix for the full test

@TrueBrain
Copy link
Member

TrueBrain commented Mar 10, 2019

Superseded by #7359

@TrueBrain TrueBrain closed this Mar 10, 2019
@glx22 glx22 deleted the glx22:fix-CI branch Mar 10, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.