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

Changes needed for new branch structure #1092

Open
Tracked by #1094
goneall opened this issue Aug 26, 2024 · 4 comments
Open
Tracked by #1094

Changes needed for new branch structure #1092

goneall opened this issue Aug 26, 2024 · 4 comments
Assignees
Labels
ci Dev workflow and repo management doc improvement Area where the project documentation needs improvement
Milestone

Comments

@goneall
Copy link
Member

goneall commented Aug 26, 2024

From the 2024-08-14 tech discussion on spec publishing and the previous discussion on translations on 2024-06-11, we agreed to rename the "under development" branch to main. This will likely break the CI.

We should create a PR for CI updates, then rename the branch before merging.

We also need to document exactly what the changes are.

We also update README and/or CONTRIBUTING file

@goneall goneall added this to the 3.0.1 milestone Aug 26, 2024
@bact bact mentioned this issue Aug 27, 2024
@goneall goneall changed the title Update CI for new branch structure Changes needed for new branch structure Aug 27, 2024
@bact bact mentioned this issue Sep 2, 2024
6 tasks
@bact bact added doc improvement Area where the project documentation needs improvement ci Dev workflow and repo management labels Sep 3, 2024
@goneall
Copy link
Member Author

goneall commented Nov 5, 2024

From the tech call on 5 November 2024, below are the specific changes we will make to the branches:

  • Rename the currently under development branch "Development/v3.0.1" to "develop"
  • Change default branch to develop
  • For each branch under Development, create a branch under Support with exactly the same commit history of that Development branch with the name support/X.Y then delete the Development branch - e.g. create a support/2.3 with the same commit history as Development/v2.3 then delete the branch Development/v2.3 - Note this should be the same as renaming Development/v2.3 to support/2.3

@zvr @sbarnum - please review the above comment for accuracy

@bact
Copy link
Collaborator

bact commented Nov 5, 2024

With this setup, it will also be possible to publish new changes in "develop" immediately to a "staging" website; while keeping the "production" website to only be published from a tag in "main".

@bact
Copy link
Collaborator

bact commented Nov 6, 2024

Crossref similar issue in spdx-3-model repo:

@goneall
Copy link
Member Author

goneall commented Nov 12, 2024

Discussed on tech call 12 Nov 2024 - agreed to branch strategy

@bact will create a pull request to update the workflows
@goneall will merge the workflow updates and rename the branches

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci Dev workflow and repo management doc improvement Area where the project documentation needs improvement
Projects
None yet
Development

No branches or pull requests

2 participants