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 branch matching on CI #19405

Closed
3 tasks
germain-gg opened this issue Oct 15, 2021 · 7 comments
Closed
3 tasks

Fix branch matching on CI #19405

germain-gg opened this issue Oct 15, 2021 · 7 comments
Labels
A-Developer-Experience T-Task Tasks for the team like planning

Comments

@germain-gg
Copy link
Contributor

This project is split across 4 layers (element-desktop, element-web, matrix-react-sdk, matrix-js-sdk). Sometimes changes are dependant on each other, meaning that a pull request on the React layer might require an update on the JS SDK. In order to not delay things artificially and wait for stuff to land on develop, branch matching has been introduced.

This process is driven by scripts/fetchdep.sh

If I open a PR on element-web with a base branch called my-branch-1.

  • The CI should check whether there's a branch called my-branch-1 on the React layer, if not fall back to using develop
  • The CI should check whether there's a branch called my-branch-1 on the JS SDK layer, if not fall back to using develop

Cases to take into consideration

  • Works when CI runs on BuildKite
  • Works when CI runs on GitHub Actions
  • Works when the base branch is on a fork
@germain-gg germain-gg added T-Task Tasks for the team like planning A-Developer-Experience labels Oct 15, 2021
@SimonBrandner
Copy link
Contributor

What makes you think this is broken? It worked fine for me the last time

@germain-gg
Copy link
Contributor Author

I have many of my branches recently that had failed tests
A recent example of that would be matrix-org/matrix-react-sdk#6949

@SimonBrandner
Copy link
Contributor

SimonBrandner commented Oct 15, 2021

I have many of my branches recently that had failed tests A recent example of that would be matrix-org/matrix-react-sdk#6949

Ah, thanks. From a quick look, the issue seems to be with BuildKite, it looks like GA are cloning the correct branch

@SimonBrandner
Copy link
Contributor

I can't remember any changes in the area that could cause this 🤔 Am I missing something?

@germain-gg
Copy link
Contributor Author

I don't think it has changed recently, but it could also be the case that it's been broken for a little while and we have not tracked the issue down

@SimonBrandner
Copy link
Contributor

but it could also be the case that it's been broken for a little while and we have not tracked the issue down

It worked for me last week though that was a fork 🤷‍♂️

@SimonBrandner
Copy link
Contributor

@gsouquet, is this still relevant since it seems to work with GHA and we're looking to get rid of BuildKite, afaik?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-Developer-Experience T-Task Tasks for the team like planning
Projects
None yet
Development

No branches or pull requests

2 participants