Ideally all commits in master are always release ready, as in tested and safe to run
I never want anyone to checkout a commit from master and it not compile or pass tests etc
I want individual commits to always happen in the development branch, including feature merges and so on
I only want the history of develop referenced in master (hence the squash)
I want develop to contain the full history of individual commits
I think it's useful information to see what commits from develop make up the latest changes in master if that makes sense.
So master is the short history, and develop is the long detailed history?
If I went with 3 wouldn't that reset the development branch?
Long story short, I built my own CI system (vnbuild) so it's always agnostic, and any user or developer can run it exactly how I do without needing Docker, GH, Jenkins etc. It can rely on branch history to create CI version numbers for me so I don't have to muddy my history with committing version numbers. If I merge the entire history the CI numbers are not incremental. This is my own fault, but I still like that every master commit is safe enough to have a release.
ChipTuner
npub1qd…3fqm7
2024-09-16 20:44:34
in reply to nevent1q…qjsz
Author Public Key
npub1qdjn8j4gwgmkj3k5un775nq6q3q7mguv5tvajstmkdsqdja2havq03fqm7Published at
2024-09-16 20:44:34Event JSON
{
"id": "2de7c98a166b9c2067214fd8e96dec295b2e8f5a0eb1d9034c12212dd43941a8",
"pubkey": "036533caa872376946d4e4fdea4c1a0441eda38ca2d9d9417bb36006cbaabf58",
"created_at": 1726519474,
"kind": 1,
"tags": [
[
"e",
"891c34bd7ea30f4c71be412125f488722f2abbc4bf97de5a3909934d8d03ba67",
"wss://relay.nostr.band/",
"root"
],
[
"e",
"146829aed8292263e42e256ac42034cfd03c316ab158d7a5f2884bd3813cd81d",
"",
"reply"
],
[
"p",
"a008def15796fba9a0d6fab04e8fd57089285d9fd505da5a83fe8aad57a3564d",
"",
"mention"
]
],
"content": "Ideally all commits in master are always release ready, as in tested and safe to run\nI never want anyone to checkout a commit from master and it not compile or pass tests etc\nI want individual commits to always happen in the development branch, including feature merges and so on\nI only want the history of develop referenced in master (hence the squash) \nI want develop to contain the full history of individual commits\n\nI think it's useful information to see what commits from develop make up the latest changes in master if that makes sense.\n\nSo master is the short history, and develop is the long detailed history?\n\nIf I went with 3 wouldn't that reset the development branch? \n\nLong story short, I built my own CI system (vnbuild) so it's always agnostic, and any user or developer can run it exactly how I do without needing Docker, GH, Jenkins etc. It can rely on branch history to create CI version numbers for me so I don't have to muddy my history with committing version numbers. If I merge the entire history the CI numbers are not incremental. This is my own fault, but I still like that every master commit is safe enough to have a release. ",
"sig": "742aeb26270f8291b22f47dbe21904cf950f24f2731ae86f0c34930d85bce397a8f4450a663c3bf82d410c22b9c53b1fe3ff8ca4c3668959aa53de01d5ff0cb6"
}