From 78d8f89ee194eaa8094ecee454f0390296be5b29 Mon Sep 17 00:00:00 2001 From: Martin Hjelmare Date: Tue, 10 Mar 2020 15:57:15 +0100 Subject: [PATCH 1/3] Bump version to 0.7.3.dev0 (#187) * Bump version to 0.7.0 * Bump version to 0.7.1 * Bump version to 0.7.2 * Bump version to 0.7.3.dev0 --- CHANGELOG.md | 10 ++++++++++ camacq/VERSION | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25d58fe4..30534d86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,20 @@ # Change Log +## [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:** + +- 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)) + ## [0.7.1](https://github.com/CellProfiling/cam_acq/tree/0.7.1) (2020-03-10) [Full Changelog](https://github.com/CellProfiling/cam_acq/compare/0.7.0...0.7.1) **Merged pull requests:** +- 0.7.1 [\#182](https://github.com/CellProfiling/cam_acq/pull/182) ([MartinHjelmare](https://github.com/MartinHjelmare)) - Fix release workflow jobs [\#181](https://github.com/CellProfiling/cam_acq/pull/181) ([MartinHjelmare](https://github.com/MartinHjelmare)) - Bump version to 0.7.1.dev0 [\#180](https://github.com/CellProfiling/cam_acq/pull/180) ([MartinHjelmare](https://github.com/MartinHjelmare)) diff --git a/camacq/VERSION b/camacq/VERSION index f749ca19..32a20eea 100644 --- a/camacq/VERSION +++ b/camacq/VERSION @@ -1 +1 @@ -0.7.2.dev0 +0.7.3.dev0 From 32e286860887fc99d5080a581262648861439fa9 Mon Sep 17 00:00:00 2001 From: Martin Hjelmare Date: Tue, 10 Mar 2020 16:08:30 +0100 Subject: [PATCH 2/3] Fix release and publish actions (#188) * Update release procedure * Pin pypi action to correct version * Allow update existing tag --- .github/workflows/release.yml | 3 ++- RELEASE.md | 7 ++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ab8c750d..a9269607 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -44,6 +44,7 @@ jobs: uses: Roang-zero1/github-create-release-action@v2.1.0 with: created_tag: ${{ steps.tag_and_prepare_release.outputs.tag }} + update_existing: true env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -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 }} diff --git a/RELEASE.md b/RELEASE.md index ebe08401..b4d94e95 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -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. From df68de229b6e7a56b5bb2826d254efa9173aa468 Mon Sep 17 00:00:00 2001 From: Martin Hjelmare Date: Tue, 10 Mar 2020 16:16:24 +0100 Subject: [PATCH 3/3] Bump version to 0.7.3 --- CHANGELOG.md | 9 +++++++++ camacq/VERSION | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30534d86..da020f24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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)) diff --git a/camacq/VERSION b/camacq/VERSION index 32a20eea..f38fc539 100644 --- a/camacq/VERSION +++ b/camacq/VERSION @@ -1 +1 @@ -0.7.3.dev0 +0.7.3