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.

Sign up for GitHub

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

Jump to bottom

Fix: rebase to 1.9 branch for backport PRs #7346

Closed
wants to merge 10 commits into from
Closed

Fix: rebase to 1.9 branch for backport PRs #7346

wants to merge 10 commits into from

Conversation

glx22
Copy link
Contributor

@glx22 glx22 commented Mar 8, 2019

No description provided.

LordAro
LordAro previously approved these changes Mar 8, 2019
View reviewed changes
TrueBrain
TrueBrain previously requested changes Mar 9, 2019
View reviewed changes
Copy link
Member

@TrueBrain TrueBrain left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

First needs fixing of OpenTTD/CompileFarm#29 btw.

@glx22
Copy link
Contributor Author

glx22 commented Mar 9, 2019 •
edited
Loading

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

@glx22 glx22 mentioned this pull request Mar 9, 2019
Merged
PeterN
PeterN previously approved these changes Mar 9, 2019
View reviewed changes
@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.

@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

Superseded by #7359

@TrueBrain TrueBrain closed this Mar 10, 2019
@glx22 glx22 deleted the fix-CI branch March 10, 2019 13:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LordAro LordAro LordAro left review comments

@TrueBrain TrueBrain TrueBrain left review comments

@PeterN PeterN PeterN left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@glx22 @TrueBrain @PeterN @LordAro