Skip to content

Commit

Permalink
Merge branch 'main' of github.com:c0fec0de/anytree into 2.x.x
Browse files Browse the repository at this point in the history
  • Loading branch information
c0fec0de committed Oct 18, 2023
2 parents b77c77f + d3161f1 commit b21895d
Showing 1 changed file with 8 additions and 14 deletions.
22 changes: 8 additions & 14 deletions CONTRIBUTE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@

## Branches

* `2.x.x` main line for 2.x.x
* `3.x.x` actual main line
* `2.x.x` main line for `2.x.x`
* `3.x.x` main line for `3.x.x`
* documentation links refer to `3.x.x`
* 2.x.x can be merged to 3.x.x
* `main`
* documentation links refer to `latest`
* 3.x.x can be merged to main
* `stable` main line for 2.x.x with release tags
* 2.x.x can be merged to main

## Testing

Expand Down Expand Up @@ -47,15 +45,6 @@ git checkout 3.x.x
git pull origin 2.x.x
git push origin 3.x.x

# Update main
git checkout main
git pull origin 3.x.x
git push origin main

# Update release branch - currently 2.x.x
git checkout stable
git pull origin 2.x.x

prev_version=$(poetry version -s)

# Version Bump
Expand All @@ -74,5 +63,10 @@ git tag "${version}" -m "Release ${version}"
git push
git push --tags

# Update main
git checkout main
git pull origin 2.x.x
git push origin main

# Publishing is handled by CI
```

0 comments on commit b21895d

Please sign in to comment.