Skip to content

Commit

Permalink
Fix publish recipe
Browse files Browse the repository at this point in the history
The current publish recipe has a race condition, where pushing a release
tag will trigger a new GitHub Actions, build, causing the push to master
to fail, because the status checks are still in progress.

Finish with `just merge` instead of `just done`, which will wait on the
status checks to finish again.

type: development
pr: #368
  • Loading branch information
casey committed Apr 11, 2020
1 parent 707fdea commit ddf097c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,14 @@ Changelog
=========


UNRELEASED - 2020-04-11
-----------------------
- :wrench: [`xxxxxxxxxxxx`](https://github.com/casey/intermodal/commits/master) Fix `publish` recipe ([#368](https://github.com/casey/intermodal/pull/368)) - _Casey Rodarmor <casey@rodarmor.com>_


[v0.1.5](https://github.com/casey/intermodal/releases/tag/v0.1.5) - 2020-04-11
------------------------------------------------------------------------------
- :bookmark: [`xxxxxxxxxxxx`](https://github.com/casey/intermodal/commits/master) Release v0.1.5 ([#366](https://github.com/casey/intermodal/pull/366)) - _Casey Rodarmor <casey@rodarmor.com>_
- :bookmark: [`707fdea21d61`](https://github.com/casey/intermodal/commit/707fdea21d61b776640950fc84228a2271da02e5) Release v0.1.5 ([#366](https://github.com/casey/intermodal/pull/366)) - _Casey Rodarmor <casey@rodarmor.com>_
- :bug: [`727d5c102840`](https://github.com/casey/intermodal/commit/727d5c102840de552822afb82de7475a5183d1f5) Fix Z Shell completions ([#365](https://github.com/casey/intermodal/pull/365)) - _Casey Rodarmor <casey@rodarmor.com>_
- :books: [`f05807290b31`](https://github.com/casey/intermodal/commit/f05807290b314cd68e8679a9aba92e5cd3c5403d) Render command help text in book to avoid wrapping ([#364](https://github.com/casey/intermodal/pull/364)) - _Casey Rodarmor <casey@rodarmor.com>_
- :books: [`ed34ff48a740`](https://github.com/casey/intermodal/commit/ed34ff48a7406adb8b4cdb523b5dc1bf9435e1bc) Add `fuchsi/maketorrent` to prior art table ([#362](https://github.com/casey/intermodal/pull/362)) - _Casey Rodarmor <casey@rodarmor.com>_
Expand Down
2 changes: 1 addition & 1 deletion justfile
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ publish: publish-check
git tag -a {{version}} -m 'Release {{version}}'
git push github {{version}}
cargo publish
just done
just merge
changelog-update:
cargo run --package changelog update
Expand Down

0 comments on commit ddf097c

Please sign in to comment.