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 3.1 release manifest #6174

Merged
merged 4 commits into from
Apr 11, 2023
Merged

Add 3.1 release manifest #6174

merged 4 commits into from
Apr 11, 2023

Conversation

torcolvin
Copy link
Collaborator

Should I also add a file for

manifest/3.1/3.1.0.xml with duplicate contents of 3.1.xml or leave that to the inevitable 3.1.1 point release?

I was going to merge this change into the release branch AND master.

@bbrks
Copy link
Member

bbrks commented Apr 6, 2023

  • 3.1.0.xml comes only when we have a new 3.1.x release (otherwise you'd end up with 2 3.1.0 manifests)
  • Nothing reads the branch version of product-config.json - master is the source of truth for what versions to build. Changing this isn't nessesary.
  • We can get the 3.1.0.xml into the release branch for our weird Jenkins jobs that depend on the release branch - but the build team's jobs read the master version.

@torcolvin
Copy link
Collaborator Author

  • Nothing reads the branch version of product-config.json - master is the source of truth for what versions to build. Changing this isn't nessesary.

Do you prefer to have release branch match master? Is it correct in theory that none of this needs to be done on the release branch?

@torcolvin torcolvin changed the base branch from release/3.1.0 to master April 6, 2023 16:17
Copy link
Member

@bbrks bbrks left a comment

Choose a reason for hiding this comment

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

A couple of things (these are in the doc)

@torcolvin torcolvin requested a review from bbrks April 6, 2023 18:02
Copy link
Member

@bbrks bbrks left a comment

Choose a reason for hiding this comment

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

the revision was added in the wrong place in the manifest

@bbrks bbrks merged commit 255397f into master Apr 11, 2023
@bbrks bbrks deleted the 3.1.0-manifest-change branch April 11, 2023 13:45
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.

2 participants