Skip to content
This repository was archived by the owner on Dec 18, 2023. It is now read-only.

Compatibility with the nightly branch #94

Merged
merged 17 commits into from
Oct 10, 2022
Merged

Conversation

ProphetLamb
Copy link
Collaborator

..., preferable without breaking the stable branch

@ProphetLamb
Copy link
Collaborator Author

Since it doesn't seem possible to trivially satisfy both stable and nightly branches, I see three options:

  1. Separate /stable branch for lts
  2. Separate /nightly branch for on the edge
  3. Drop nightly support entirely.

For 1 and 2 the matrix.channel will choose nightly versus stable depending on the branch, instead of both channels

@Du-z
Copy link
Collaborator

Du-z commented Oct 9, 2022

A minor tweak to your 1 and 2 plan.

Could we drop the nightly tests for the master branch, and do nightly tests against a develop branch?

Stable tests against:
master: the is where the released and very soon to be released builds go.
hotfix/*: for the rare bug that must be fixed.

Nightly tests against:
develop most PRs merge into here
feature/*: most of our commits are done here, and will merge into develop via PRs

This way develop can merge into directly into master as soon as the next version of Surreal is released with tests that are already green.

The main downside is that it requires us to dev against a potentially buggy nightly. If there are release candidate builds of surreal, I could see this this strategy working very well.

@ProphetLamb ProphetLamb self-assigned this Oct 9, 2022
@ProphetLamb
Copy link
Collaborator Author

@Du-z That sounds great! Ill restructure according to your suggestion. Thanks for the input!
On that note, before actually hacking together a solution, ill formalize these decision in a /CONTRIBUTING.md .
Feel free to review it at your leisure once created.

@ProphetLamb
Copy link
Collaborator Author

ProphetLamb commented Oct 9, 2022

I have reverted all code-changes in this branch, so that we can now merge it.
Since affecting these changes will invalidate existing PRs, I will change the following PRs to the develop branch.

@ProphetLamb ProphetLamb requested a review from Du-z October 9, 2022 18:31
Copy link
Collaborator

@Du-z Du-z left a comment

Choose a reason for hiding this comment

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

Looks good, I just updated README.md to be a bit more explicit about which branch to merge the PR into.

Also i think the latest release didn't go out properly? Looks like it used the wrong version number.

@ProphetLamb ProphetLamb merged commit dcc0d47 into master Oct 10, 2022
@ProphetLamb ProphetLamb deleted the bug/nightly_compatibility branch October 10, 2022 05:09
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants