Skip to content

Commit

Permalink
Prepare repository for Tenzir v4.0.0-rc4 (#3308)
Browse files Browse the repository at this point in the history
This commit is was created with /scripts/prepare-release.

Here is a high-level summary of the changes:

* Updated `/version.json` to v4.0.0-rc4 and the expected rev-count of
the merge commit to 17247.
* Generated a new entry in the docs version selector list.
* Removed the docs for the previous release candidate.
* Moved all changelog entries from `/changelog/next` to
`/changelog/v4.0.0-rc4`.
* Moved all changelog entries from `/changelog/v4.0.0-rc3` to
`/changelog/v4.0.0-rc4`.
* Updated the python bindings version in `/python/pyproject.toml` to
v4.0.0-rc4.

This commit also includes fixes to the `prepare-release` script itself.
  • Loading branch information
tobim committed Jul 6, 2023
2 parents 218564f + afc1bd2 commit 99b166e
Show file tree
Hide file tree
Showing 219 changed files with 1,634 additions and 831 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion python/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "pyvast"
version = "4.0.0-rc3"
version = "4.0.0-rc4"
description = "A security telemetry engine for detection and response"
authors = ["Tenzir <engineering@tenzir.com>"]
maintainers = ["Tenzir <engineering@tenzir.com>"]
Expand Down
16 changes: 10 additions & 6 deletions scripts/prepare-release
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ version_json="$(jq --arg v "${new_version#v}" --arg cnt "${rev_count}" \
'."tenzir-version-fallback" = $v | ."tenzir-version-rev-count" = ($cnt|tonumber)' version.json)"
echo -E "${version_json}" > version.json
things_done+="
* Updated `/version.json` to ${new_version} and the expected rev-count of the
* Updated \`/version.json\` to ${new_version} and the expected rev-count of the
merge commit to ${rev_count}."

# If the new version is not a release candidate, change mentions of the version
Expand All @@ -84,9 +84,11 @@ if [[ true ]]; then
new_version_name="Tenzir ${new_version_major_minor}"
jq "map(select(. | startswith(\"${new_version_name%-*}\") | not))" < versions.json > versions.json.tmp
mv -f versions.json.tmp versions.json
things_done+="\n* Generated a new entry in the docs version selector list."
things_done+="
* Generated a new entry in the docs version selector list."
if [ -d "versioned_docs/version-${new_version_name%-*}"* ]; then
things_done+="\n* Removed the docs for the previous release candidate."
things_done+="
* Removed the docs for the previous release candidate."
else
fi
# The `|| true`s in the next two lines work around a `zsh` behavior where
Expand All @@ -109,7 +111,8 @@ if [ -d "${source_dir}/changelog/next" ]; then
rsync -avzh "${source_dir}/changelog/next/" \
"${source_dir}/changelog/${new_version}"
rm -r "${source_dir}/changelog/next"
things_done+="\n* Moved all changelog entries from `/changelog/next` to `/changelog/${new_version}`."
things_done+="
* Moved all changelog entries from \`/changelog/next\` to \`/changelog/${new_version}\`."
fi

# If the previous release was an rc as well, merge the changelog directories.
Expand All @@ -119,15 +122,16 @@ if [[ "${last_rc_version}" == *"-rc"* ]]; then
"${source_dir}/changelog/${new_version}"
rm -r "${source_dir}/changelog/${last_rc_version}"
fi
things_done+="\n* Moved all changelog entries from `/changelog/${last_rc_version}` to `/changelog/${new_version}`."
things_done+="
* Moved all changelog entries from \`/changelog/${last_rc_version}\` to \`/changelog/${new_version}\`."
fi

# Update version of Python bindings.
pushd "${source_dir}/python"
poetry version "${new_version#v}"
popd
things_done+="
* Updated the python bindings version in `/python/pyproject.toml` to ${new_version}."
* Updated the python bindings version in \`/python/pyproject.toml\` to ${new_version}."

# Commit and open a PR against tenzir/tenzir.
pushd "${source_dir}"
Expand Down
4 changes: 2 additions & 2 deletions version.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
"annotated git tag without the leading 'v'.",
"This value gets updated automatically by `scripts/prepare-release`."
],
"tenzir-version-fallback": "4.0.0-rc3",
"tenzir-version-fallback": "4.0.0-rc4",
"tenzir-version-rev-count_COMMENT": [
"This value stores the ancestor count of the tagged commit, calculated",
"with `git rev-list --count HEAD`, then incremented by 1. This operates",
"under the assumption that the release-preparing PR contains exactly one",
"commit and is rebased before merging."
],
"tenzir-version-rev-count": 17208,
"tenzir-version-rev-count": 17284,
"tenzir-partition-version_COMMENT": [
"The partition version. This number must be bumped alongside the release",
"version for releases that contain major format changes to the on-disk",
Expand Down
305 changes: 0 additions & 305 deletions web/versioned_docs/version-Tenzir v4.0-rc3/get-started.md

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 99b166e

Please sign in to comment.