Skip to content

Commit

Permalink
3.33.0 (#2676)
Browse files Browse the repository at this point in the history
  • Loading branch information
trentm authored May 5, 2022
1 parent fb9d69f commit a34d589
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 33 deletions.
15 changes: 12 additions & 3 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,9 @@ Notes:
[[release-notes-3.x]]
=== Node.js Agent version 3.x
==== Unreleased
[float]
===== Breaking changes
[[release-notes-3.33.0]]
==== 3.33.0 2022/05/05
[float]
===== Features
Expand All @@ -57,6 +56,16 @@ types, because it is only expected to be useful for coming OTel Bridge work.
proxy, which can throw `ERR_HTTP2_SOCKET_UNBOUND` after the session is
destroyed. ({issues}2670[#2670])
[float]
===== Chores
- The release process is slightly changed. CI (Jenkins) now handles `npm
publish ...` when a tag is pushed. ({pull}2667[#2667])
- Pulled the `traceparent` NPM module into a local module and replaced the
`random-poly-fill` module with the built in `require('crypto').randomFillSync`
function call ({pull}2669[#2669])
[[release-notes-3.32.0]]
==== 3.32.0 2022/04/27
Expand Down
34 changes: 5 additions & 29 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -184,41 +184,17 @@ If you have access to make releases, the process is as follows:
- the EOL table in `docs/upgrading.asciidoc`, if this is a major or minor
release. EOL is 18 months after release date.
1. Ensure PR checks pass, then merge to main.
1. Publish to npm with `npm publish`.
This must be done *before* the release tag is pushed, because the automated
release process is triggered by the tag push and (the opbeans
bump-version.sh release step) depends on the new version having been
published to npm.
1. Working on the elastic repo now (not a fork), tag the merged-to-main commit
with `git tag vx.y.x && git push origin vx.y.z`. For example: `git tag
v1.2.3 && git push origin v1.2.3`.
(The Jenkins CI "Release" stage will handle `npm publish ...`ing the new
package version. See the appropriate [apm-ci tag build for this repo](https://apm-ci.elastic.co/job/apm-agent-nodejs/job/apm-agent-nodejs-mbp/view/tags/).)
1. Reset the latest major branch (currently `3.x`) to point to the current
main, e.g. `git branch -f 3.x main && git push origin 3.x`
### Past major
1. Be sure you have checked out the branch associated with the major you wish
to release and have pulled latest changes, e.g. `2.x`.
1. Make a PR titled "x.y.z" (the new version) which updates:
- the version in `package.json`,
- "CHANGELOG.asciidoc": Add missing changelog entries, if any. Then change
the "Unreleased" section title to:
```
[[release-notes-x.y.z]]
==== x.y.z - YYYY/MM/DD
```
- the EOL table in `docs/upgrading.asciidoc`, if this is a major or minor
release. EOL is 18 months after release date.
1. Ensure PR checks pass, then merge to main.
1. Publish to npm with `npm publish --tag=2x`.
**It is important to include that `--tag=2x`.**
This must be done *before* the release tag is pushed, because the automated
release process is triggered by the tag push and (the opbeans
bump-version.sh release step) depends on the new version having been
published to npm.
1. Working on the elastic repo now (not a fork), tag the merged-to-main commit
with `git tag vx.y.x && git push origin vx.y.z`. For example: `git tag
v1.2.3 && git push origin v1.2.3`.
1. Make a PR against `main` containing the updates to `CHANGELOG.asciidoc` so
that `main` always contain information about all releases
This is not currently supported. Until [this issue](#2668) is resolved one
**must not** push a "vX.Y.Z" version tag to the repository on GitHub that is
for a version other than the current major.
1 change: 1 addition & 0 deletions docs/upgrading.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ The table below is a simplified description of this policy.
[options="header"]
|====
|Agent version |EOL Date |Maintained until
|3.33.x |2023-11-05 |3.34.0
|3.32.x |2023-10-27 |3.33.0
|3.31.x |2023-09-23 |3.32.0
|3.30.x |2023-09-10 |3.31.0
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "elastic-apm-node",
"version": "3.32.0",
"version": "3.33.0",
"description": "The official Elastic APM agent for Node.js",
"main": "index.js",
"types": "index.d.ts",
Expand Down

0 comments on commit a34d589

Please sign in to comment.