search

Surreal-Net / Surreal.Net

Database driver for SurrealDB available for REST and RPC sessions.
Apache License 2.0
57 stars 7 forks source link

Compatibility with the nightly branch #94

Closed ProphetLamb closed 1 year ago

ProphetLamb commented 1 year ago

..., preferable without breaking the stable branch

ProphetLamb commented 1 year ago

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 commented 1 year ago

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 commented 1 year ago

@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 commented 1 year ago

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.