Skip to content

Commit

Permalink
No code: Update changelog (#1359)
Browse files Browse the repository at this point in the history
* No code: Prep changelog for v3 release

* No code: Update release process docs
  • Loading branch information
ameyer-rigetti committed Jul 12, 2021
1 parent cb9b0e7 commit 3668007
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 0 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@ Changelog

### Announcements

### Improvements and Changes

### Bugfixes

[v3.0.0](https://github.com/rigetti/pyquil/releases/tag/v3.0.0)
------------------------------------------------------------------------------------

### Announcements

- pyQuil now directly supports the QCS API v1.0, offering you better performance and more
granular data about QCS quantum processors.

Expand Down
11 changes: 11 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,17 @@ release is desired, the `rc` branch should be merged to `master`. This will trig
to [GitHub][gh-releases], [PyPI][pypi], and [DockerHub][docker-forest] (with image tags `latest` and
`<version>`).

After a final release is produced by Semantic Release, `master` will need to be `merged` back into `rc`
(due to additional `master` commits created by Semantic Release). This is necessary to re-synchronize
`rc` with `master` so that further development can continue on `rc`.

> ⚠️ **WARNING**:
>
> Never rebase (or force-push to) the `rc` or `master` branches. Merge only, as Semantic Release
> relies heavily on tags and notes attached to previous release commits. See [this help page][sr-fp] for more info.
[sr-fp]: https://semantic-release.gitbook.io/semantic-release/support/troubleshooting#release-not-found-release-branch-after-git-push-force

> **Note:** While Semantic Release does a good job of creating release notes for the GitHub release,
> it may be necessary to hand-modify them after they're posted to simplify/clarify them. For instance,
> if a feature or fix was introduced on `rc` over a series of commits/PRs (not necessarily adjacent),
Expand Down

0 comments on commit 3668007

Please sign in to comment.