Skip to content

Commit a638519

Browse files
committed
Update clamav git workflow to document new procedures, removing the dev & sec/dev branches
1 parent 5b31b7e commit a638519

2 files changed

Lines changed: 1 addition & 13 deletions

File tree

src/images/clamav-git-workflow.png

-1.93 KB
Loading

src/manual/Development/clamav-git-work-flow.md

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,7 @@ Feature release branches. These always contain the latest stable patch versions
1414

1515
When development towards the next feature release is complete, a new `rel/X.Y` branch is created from `main` and a release tag is created.
1616

17-
When a new patch version is needed, a `dev/X.Y.Z` branch is created from the `rel/X.Y` branch. When development of that patch version is complete, the `dev/X.Y.Z` branch is merged back into the `rel/X.Y` branch, and a release tag is created.
18-
19-
#### `dev/1.0.1`, `dev/1.0.2`, etc.:
20-
21-
A development branch used to test hotfixes prior to a patch release.
22-
23-
#### `sec/dev/1.0.1`, etc.:
24-
25-
A private development branch used to test security-related hotfixes prior to a patch release. This branch will be rebased like any feature branch as needed up until the release.
26-
27-
The ClamAV team maintains an internal mirror of the `clamav` repository in order to facilitate private branches, which are not a normal feature of the Git version control system.
28-
29-
On release day, the private `sec/dev/1.0.1` branch would be pulled into the public `dev/1.0.1` branch and then into the `rel/1.0` branch where it would be tagged as "`clamav-1.0.1`".
17+
The ClamAV team develops security fixes in an internal mirror of the `clamav` repository. Work for the next patch release takes place on an internal `rel/X.Y` branch. When the release is ready, the team publishes those commits to the corresponding public branch and creates a release tag. For example, ClamAV 1.0.1 would be published from the internal `rel/1.0` branch to the public `rel/1.0` branch and tagged `clamav-1.0.1`.
3018

3119
#### `feature/description`:
3220

0 commit comments

Comments
 (0)