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

add release docs to explain branching #494

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

add release docs to explain branching #494

wants to merge 1 commit into from

Conversation

colearendt
Copy link
Contributor

No description provided.

Copy link
Collaborator

@ianpittwood ianpittwood left a comment

Choose a reason for hiding this comment

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

LGTM. We should merge this soon and create the branches if we want this to become the new norm for our next release(s).

@msarahan
Copy link
Contributor

I wrote up this doc for my idea on splitting repos: https://positpbc.atlassian.net/wiki/spaces/ENG/pages/293437505/March+2023+rstudio-docker-products+rework

I also tinkered with the idea at https://github.com/orgs/repo-federation-demo/repositories?type=source

Ultimately, I think it may not work due to requiring PAT, which would require a service account, which I don't think IT wants to do. However, it has given me some ideas on how to blend the stuff in there with our mono-repo here. I will describe that in another issue.

One thing that I think this PR needs is a description of how to update older releases, like the vm2 CVE thing in the 2022.07.0 r-session-complete image. The general idea in my mind is:

  • find where the image was updated to the next version.
  • In your terminal, with a local clone of the rstudio-docker-products repo, git checkout <commit id you copied>~1 - Note the ~1 on the end there. It says "the commit one before this reference"
  • create a new branch: git switch -c <new branch name>. The naming standard for old release branches is: <image-name>-<image-version>-x, where the -x indicates that it is a living branch, not a tag.
  • Edit the workflows as necessary to remove other products (see dev...r-session-complete-2022.07.0-x for an example)
  • Commit the workflows
  • Push the branch. Ideally, your images are pushed automatically. If not, you need to revise your workflows

Please revise and add this as you see fit.

@bschwedler
Copy link
Contributor

@ianpittwood Do you think this is worth merging in, or would you rather we remove the dev branch entirely?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants