Timeline for How can you do pre-merge testing in trunk based development?
Current License: CC BY-SA 4.0
8 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Sep 7, 2022 at 20:11 | comment | added | TTT |
@JamesGeddes From a purely Git perspective, this debate is kind of funny. In Git, a branch is a pointer to a commit that has a name. If the "trunk" is called main on the remote, and you call your local branch main, then it's TBD. If you rename your local branch to my-branch then TBD magically changes into "Feature Branch Workflow", which is also known as GitHub Flow and many other popular CI workflows. 😉 PR's are fine, just temporarily rename (or copy) your local main to something else and push it out so you can use the PR tool functionality, if you want to.
|
|
| May 4, 2022 at 15:06 | comment | added | Thomas Owens | @JamesGeddes I'd have to rewatch that video to be 100%, but I watched it when it came out (his channel is great). I highly doubt he'd object to your pipeline blocking a merge, but I suspect he's say that you should be aiming to get your branch into main (meaning it passes the pipeline) within a day or two of opening it. That also has implications for how long your pipeline should take to execute - 10 or 15 minutes could be a very long pipeline. You can always defer more to post-merge - it's all about balancing ensuring quality, reducing risk, and letting people use your changes to buildon. | |
| May 4, 2022 at 15:00 | comment | added | James Geddes | Ah with you. I thought Dave Farley is saying that all PRs are always evil. Automated testing ftw. | |
| May 4, 2022 at 14:56 | comment | added | Thomas Owens | @JamesGeddes In that video, Dave Farley is talking about human-gated pull requests. I mentioned this in my answer - you can still use pull request tools (like GitHub, Bitbucket, and perhaps others) to perform automated checks and automatically merge, while deferring human reviews for later. However, there is no way to both commit to trunk and run your pipeline before a merge. You need to decide what is more important - waiting a short period of time (hopefully minutes) to get your automated results and merging or integrating faster and getting results later. | |
| May 4, 2022 at 14:19 | comment | added | James Geddes | I did, however not committing to main is surely not pure trunk based dev youtu.be/ASOSEiJCyEM | |
| May 4, 2022 at 13:27 | comment | added | Thomas Owens | @JamesGeddes Did you see what site the links point to? Yes, that's from the definition of trunk-based development. | |
| May 4, 2022 at 12:09 | comment | added | James Geddes | Is that still trunk based though? Your suggestion sounds like people should create feature branches rather than committing directly to main, which is our current situation. | |
| May 4, 2022 at 9:41 | history | answered | Thomas Owens | CC BY-SA 4.0 |