Skip to content

Commit

Permalink
Merge pull request #189 from CellProfiling/rc
Browse files Browse the repository at this point in the history
0.7.3
  • Loading branch information
MartinHjelmare authored Mar 10, 2020
2 parents 514e91c + df68de2 commit 9927caf
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 7 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ jobs:
uses: Roang-zero1/[email protected]
with:
created_tag: ${{ steps.tag_and_prepare_release.outputs.tag }}
update_existing: true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand All @@ -57,7 +58,7 @@ jobs:
name: built-output
path: ./dist
- name: Publish package
uses: pypa/gh-action-pypi-publish@v1
uses: pypa/gh-action-pypi-publish@v1.1.0
with:
user: __token__
password: ${{ secrets.PYPI_TOKEN }}
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
# Change Log

## [0.7.3](https://github.com/CellProfiling/cam_acq/tree/0.7.3) (2020-03-10)
[Full Changelog](https://github.com/CellProfiling/cam_acq/compare/0.7.2...0.7.3)

**Merged pull requests:**

- Fix release and publish actions [\#188](https://github.com/CellProfiling/cam_acq/pull/188) ([MartinHjelmare](https://github.com/MartinHjelmare))
- Bump version to 0.7.3.dev0 [\#187](https://github.com/CellProfiling/cam_acq/pull/187) ([MartinHjelmare](https://github.com/MartinHjelmare))

## [0.7.2](https://github.com/CellProfiling/cam_acq/tree/0.7.2) (2020-03-10)
[Full Changelog](https://github.com/CellProfiling/cam_acq/compare/0.7.1...0.7.2)

**Merged pull requests:**

- 0.7.2 [\#186](https://github.com/CellProfiling/cam_acq/pull/186) ([MartinHjelmare](https://github.com/MartinHjelmare))
- Add rc label check action [\#185](https://github.com/CellProfiling/cam_acq/pull/185) ([MartinHjelmare](https://github.com/MartinHjelmare))
- Update release instructions [\#184](https://github.com/CellProfiling/cam_acq/pull/184) ([MartinHjelmare](https://github.com/MartinHjelmare))
- Bump version to 0.7.2.dev0 [\#183](https://github.com/CellProfiling/cam_acq/pull/183) ([MartinHjelmare](https://github.com/MartinHjelmare))
Expand Down
7 changes: 2 additions & 5 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ It's important to name it correctly to allow the github release action to work.
- Merge the pull request into `master`, do not squash.
- Fetch and checkout the `master` branch.
- Fetch and checkout the `develop` branch.
- Checkout a new branch to bump version, eg `bump-version` from `develop`.
- Merge `master` into the new branch `bump-version`.
- Merge `master` into branch `develop`.
- Update version in `VERSION` to the new develop version number, eg `'0.3.0.dev0'`
- Commit with commit message `Bump version to 0.3.0.dev0` and push the `bump-version` branch.
- Create a pull request from branch `bump-version` to `develop`.
- Squash merge the pull request into `develop`.
- Commit with commit message `Bump version to 0.3.0.dev0` and push the `develop` branch to origin.
2 changes: 1 addition & 1 deletion camacq/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.7.2
0.7.3

0 comments on commit 9927caf

Please sign in to comment.