Skip to content

Commit

Permalink
Merge branch 'develop' into shuffle-peers
Browse files Browse the repository at this point in the history
  • Loading branch information
dshulyak committed Nov 14, 2023
2 parents 0c85be5 + 8a0a6f2 commit f20c310
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
12 changes: 9 additions & 3 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

## Releasing a major version

Rename UNRELEASED to a concrete `version` and create a PR with commit: Release `version`.
Branch name should match the `version` set in CHANGELOG.
Additionally tag that same commit with 0 as a patch version (if branch is v1.1 - tag is v1.1.0).
Update `CHANGELOG.md` by renaming UNRELEASED to a concrete version `x.y.0` and create a PR with commit: Release `x.y.0`.
Branch name should match the version set in CHANGELOG but only include major and minor version: `vx.y` (e.g. v1.1).
Additionally tag that same commit with `0` as a patch version (if branch is v1.1 - tag is v1.1.0).

## Releasing a minor version

Expand Down Expand Up @@ -39,3 +39,9 @@ After releasing a new major or minor version, create a new UNRELEASED section at

### Improvements
```

Additionally if a `dddd_next.sql` exists in `sql/migrations/state` and/or `sql/migrations/local` rename it to
`dddd_vx.y.z.sql` where `x.y.z` is the new version and `dddd` is the next available number.

The first PR that needs a DB migrations creates a new `dddd_next.sql` file in `sql/migrations/state` and/or
`sql/migrations/local`.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/ALTree/bigfloat v0.2.0
github.com/chaos-mesh/chaos-mesh/api v0.0.0-20231016140705-13ea12f85a58
github.com/cosmos/btcutil v1.0.5
github.com/go-llsqlite/crawshaw v0.4.0
github.com/go-llsqlite/crawshaw v0.5.0
github.com/gofrs/flock v0.8.1
github.com/google/go-cmp v0.6.0
github.com/google/gofuzz v1.2.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
github.com/go-llsqlite/crawshaw v0.4.0 h1:L02s2jZBBJj80xm1VkkdyB/JlQ/Fi0kLbNHfXA8yrec=
github.com/go-llsqlite/crawshaw v0.4.0/go.mod h1:/YJdV7uBQaYDE0fwe4z3wwJIZBJxdYzd38ICggWqtaE=
github.com/go-llsqlite/crawshaw v0.5.0 h1:Olbqkth53vkkh4WvmkYjrtfOBcxXD3rMYBYuk6FNH3E=
github.com/go-llsqlite/crawshaw v0.5.0/go.mod h1:/YJdV7uBQaYDE0fwe4z3wwJIZBJxdYzd38ICggWqtaE=
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
Expand Down
File renamed without changes.

0 comments on commit f20c310

Please sign in to comment.