Skip to content

Commit

Permalink
Merge pull request #625 from manuelwedler/fix-ci-build
Browse files Browse the repository at this point in the history
Fix CI build and bump version 1.2.0 → 1.2.1
  • Loading branch information
karlb authored Apr 26, 2021
2 parents 8397e3b + 3fe21f3 commit 7d25233
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.2.0
current_version = 1.2.1
commit = True
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)(?P<build>\d+))?
Expand Down
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## [Unreleased]

## [1.2.1] - 2020-04-26
### Fixed
- Fixed a problem in the build process of v1.2.0.

## [1.2.0] - 2020-04-26
### Added
- [#556] New dialog for interacting with the UDC. The dialog enables depositing and withdrawing tokens.
Expand Down Expand Up @@ -181,7 +185,8 @@ token network.
### Changed
- First python package release.

[Unreleased]: https://github.com/raiden-network/webui/compare/v1.2.0...HEAD
[Unreleased]: https://github.com/raiden-network/webui/compare/v1.2.1...HEAD
[1.2.1]: https://github.com/raiden-network/webui/compare/v1.2.0...v1.2.1
[1.2.0]: https://github.com/raiden-network/webui/compare/v1.1.1...v1.2.0
[1.1.1]: https://github.com/raiden-network/webui/compare/v1.1.0...v1.1.1
[1.1.0]: https://github.com/raiden-network/webui/compare/v1.0.2...v1.1.0
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "raiden-webui",
"version": "1.2.0",
"version": "1.2.1",
"license": "MIT",
"scripts": {
"preinstall": "npx only-allow yarn",
Expand Down
8 changes: 6 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ def finalize_options(self):
def run(self):
yarn = find_executable('yarn')
if not yarn:
raise RuntimeError('Yarn not found. Aborting')
self.announce(
'Yarn not found. Skipping webUI compilation',
level=distutils.log.WARN, # pylint: disable=no-member
)
return

yarn_run = 'build:prod'
if self.dev is not None:
Expand Down Expand Up @@ -72,7 +76,7 @@ def run(self):

history = ''

version = '1.2.0' # Do not edit: this is maintained by bumpversion (see .bumpversion.cfg)
version = '1.2.1' # Do not edit: this is maintained by bumpversion (see .bumpversion.cfg)

setup(
name='raiden-webui',
Expand Down
2 changes: 1 addition & 1 deletion src/version.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// Do not change this, this is maintained by bumpversion.
export const version = '1.2.0';
export const version = '1.2.1';

0 comments on commit 7d25233

Please sign in to comment.