Skip to content

Commit

Permalink
fix: Do not double count integration in changelogs and statistics.
Browse files Browse the repository at this point in the history
When calling `release-tool.py -l --only-backend`, integration was not
listed, but this was fixed in 170f2db (3.2.0). So in all versions
after that, we should remove the extra addition to avoid counting it,
and rendering it, twice.

This breaks rendering of 3.1.0 and older, but we don't need those
anymore, and in any case, it's best to use the tool in the relevant
release branch when rendering.

Changelog: Title
Ticket: None

Signed-off-by: Kristian Amlie <[email protected]>
  • Loading branch information
Kristian Amlie committed Oct 14, 2022
1 parent 791d78f commit 1705fcd
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 384 deletions.
1 change: 0 additions & 1 deletion extra/changelog-generator/changelog-generator
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ if args.all:
.strip()
)
repos += [os.path.join(base_dir, repo) for repo in repo_list.split()]
repos.append(os.path.join(base_dir, "integration"))
else:
repos.append(".")

Expand Down
1 change: 0 additions & 1 deletion extra/statistics-generator
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ collect_changes() {
# Sorting is important because we need "*-enterprise" repositories to
# come after their Open Source counterparts (see below).
REPO_LIST="$("$RELEASE_TOOL" --list git --in-integration-version $1 --only-backend | sort)"
REPO_LIST="$REPO_LIST integration"
fi

declare -A os_commits
Expand Down
Loading

0 comments on commit 1705fcd

Please sign in to comment.