Skip to content

Commit 0e67249

Browse files
authored
Bump SBOM serial number post 1.13.2 (#997)
* bump SBOM `serialNumber` * tweak release steps: ** always generate new SBOM serial number on release branch. *** step previously noted only during a minor release. ** replace `minor` with `non-patch` *** to clarify that steps apply for a minor or major release. * only generate SBOM serial number on `master` following a non-patch release.
1 parent 08b6737 commit 0e67249

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

doc/releasing.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Go to [Snyk](https://app.snyk.io/) and select the `dev-prod` organization. If ac
1919

2020
##### Update Snyk
2121

22-
Update the Snyk reference target tracking the to-be-released branch. For a patch release (e.g. x.y.z), check-out the `rx.y` branch and update the `rx.y` reference target. For a minor release (e.g. x.y.0), check out the `master` branch and update the `master` reference target.
22+
Update the Snyk reference target tracking the to-be-released branch. For a patch release (e.g. x.y.z), check-out the `rx.y` branch and update the `rx.y` reference target. For a non-patch release (e.g. x.y.0), check out the `master` branch and update the `master` reference target.
2323

2424
Run `cmake` to ensure generated source files are present:
2525
```bash
@@ -61,11 +61,11 @@ Check the contents of the "vulnerabilities" field (if present) in the Augmented
6161

6262
Do the following when releasing:
6363
- If this is a feature release (e.g. `x.y.0` or `x.0.0`), follow these steps: [Creating SSDLC static analysis reports](https://docs.google.com/document/d/1rkFL8ymbkc0k8Apky9w5pTPbvKRm68wj17mPJt2_0yo/edit).
64-
- Check out the release branch. For a release `x.y.z`, the release branch is `rx.y`. If this is a new minor release (`x.y.0`), create the release branch.
64+
- Check out the release branch. For a release `x.y.z`, the release branch is `rx.y`. If this is a new non-patch release (`x.y.0`), create the release branch.
6565
- Update CHANGELOG.md with the version being released.
6666
- Ensure `etc/purls.txt` is up-to-date.
6767
- Update `etc/third_party_vulnerabilities.md` with any updates to new or known vulnerabilities for third party dependencies that must be reported.
68-
- If this is a new minor release (e.g. `x.y.0`):
68+
- If this is a new non-patch release (e.g. `x.y.0`):
6969
- Update the Linux distribution package installation instructions in [README.md](../README.md) to refer to the new version `x.y`.
7070
- Update the [libmongocrypt-release](https://spruce.mongodb.com/project/libmongocrypt-release/settings/general) Evergreen project (requires auth) to set `Branch Name` to `rx.y`.
7171
- Commit the changes on the `rx.y` branch with a message like "Release x.y.z".
@@ -84,14 +84,13 @@ Do the following when releasing:
8484
Download the Augmented SBOM from a recent execution of the `sbom` task in an Evergreen patch or commit build.
8585
- Attach `etc/third_party_vulnerabilities.md` to the release.
8686
- Attach `etc/ssdlc_compliance_report.md` to the release.
87-
88-
- If this is a new minor release (e.g. `x.y.0`):
87+
- Check out the release branch (`rx.y`). Generate a new unique SBOM serial number for the next upcoming patch release (e.g. for `1.13.1` following the release of `1.13.0`):
88+
```bash
89+
./.evergreen/earthly.sh +sbom-generate-new-serial-number
90+
```
91+
Commit resulting `etc/cyclonedx.sbom.json` and push to `rx.y`.
92+
- If this is a new non-patch release (e.g. `x.y.0`):
8993
- File a DOCSP ticket to update the installation instructions on [Install libmongocrypt](https://www.mongodb.com/docs/manual/core/csfle/reference/libmongocrypt/). ([Example](https://jira.mongodb.org/browse/DOCSP-47954))
90-
- Check out the release branch (`rx.y`). Generate a new unique SBOM serial number for the next upcoming patch release (e.g. for `1.13.1` following the release of `1.13.0`):
91-
```bash
92-
./.evergreen/earthly.sh +sbom-generate-new-serial-number
93-
```
94-
Commit resulting `etc/cyclonedx.sbom.json` and push to `rx.y`.
9594
- Create a new Snyk reference target. The following instructions use the example branch `rx.y`:
9695

9796
Run `cmake` to ensure generated source files are present:
@@ -121,7 +120,7 @@ Do the following when releasing:
121120
- Add the new release branch to the `Payload URL`. Remove unmaintained release branches.
122121
- Make a PR to to the `master` branch:
123122
- Apply changes from the "Release x.y.z" commit.
124-
- Generate a new unique SBOM serial number next upcoming non-patch release (e.g. for `1.14.0` following the release of `1.13.0`):
123+
- If this was a non-patch release (e.g. `x.y.0`), generate a new unique SBOM serial number for the next upcoming non-patch release (e.g. for `1.14.0` following the release of `1.13.0`):
125124
```bash
126125
./.evergreen/earthly.sh +sbom-generate-new-serial-number
127126
```
@@ -132,13 +131,14 @@ Do the following when releasing:
132131

133132
## Homebrew steps ##
134133
Submit a PR to update the Homebrew package https://github.com/mongodb/homebrew-brew/blob/master/Formula/libmongocrypt.rb. ([Example](https://github.com/mongodb/homebrew-brew/pull/234)). If not on macOS, request a team member to do this step.
134+
Request review by posting in #ask-devprod-build.
135135

136136
## Debian steps ##
137137
If you are not a Debian maintainer on the team, request a team member to do the steps in this section.
138138

139139
Refer to the [Debian](https://github.com/mongodb/mongo-c-driver/blob/master/docs/dev/debian.rst) steps.
140140

141-
For a minor release (e.g. x.y.0), submit a merge request to the [extrepo-data](https://salsa.debian.org/extrepo-team/extrepo-data) project in Debian to update the PPA. The change would look something like this:
141+
For a non-patch release (e.g. x.y.0), submit a merge request to the [extrepo-data](https://salsa.debian.org/extrepo-team/extrepo-data) project in Debian to update the PPA. The change would look something like this:
142142

143143
```
144144
diff --git a/repos/debian/libmongocrypt.yaml b/repos/debian/libmongocrypt.yaml

etc/cyclonedx.sbom.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
}
5858
],
5959
"metadata": {
60-
"timestamp": "2025-04-08T13:06:37.750496+00:00",
60+
"timestamp": "2025-04-08T15:21:23.237097+00:00",
6161
"tools": [
6262
{
6363
"externalReferences": [
@@ -100,7 +100,7 @@
100100
}
101101
]
102102
},
103-
"serialNumber": "urn:uuid:d3342f3b-6584-4fff-9131-fabb6a8c492c",
103+
"serialNumber": "urn:uuid:9e8a6b86-64aa-4438-bd54-80fd66afce96",
104104
"version": 1,
105105
"$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json",
106106
"bomFormat": "CycloneDX",

0 commit comments

Comments
 (0)