Skip to content
This repository has been archived by the owner on Feb 26, 2020. It is now read-only.

[STABLE] Bump Beta to Stable #165

Merged
merged 2 commits into from
Jul 12, 2018
Merged

[STABLE] Bump Beta to Stable #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe296e2
Require correct version of Parity
amaury1093 Jul 11, 2018
6f64c63
Bump beta to stable
amaury1093 Jul 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "parity-ui",
"version": "0.2.7",
"version": "0.2.8",
"description": "The Electron app for Parity UI",
"main": ".build/electron.js",
"jsnext:main": ".build/electron.js",
Expand All @@ -25,7 +25,7 @@
"Parity"
],
"parity": {
"channel": "beta"
"channel": "stable"
},
"scripts": {
"build": "npm run build:inject && npm run build:app && npm run build:electron && npm run build:embed",
Expand Down
6 changes: 3 additions & 3 deletions scripts/publish-snap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ set -e # fail on any error
set -u # treat unset variables as error

case ${CI_COMMIT_REF_NAME} in
master|ci-package|v0.3*) export CHANNEL="edge";;
v0.2*) export CHANNEL="beta";;
v0.1*) export CHANNEL="stable";;
master|ci-package|v0.4*) export CHANNEL="edge";;
v0.3*) export CHANNEL="beta";;
v0.2*) export CHANNEL="stable";;
*) echo "No release" exit 0;;
esac
echo "Release channel :" $CHANNEL " Branch/tag: " $CI_COMMIT_REF_NAME
Expand Down
4 changes: 2 additions & 2 deletions src/Connection/connection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ class Connection extends Component {
if (!versionInfo) { return true; } // Simpler to return true when pinging for parity_versionInfo
const { version: { major, minor } } = versionInfo;

return major > 1 || (major === 1 && minor >= 10);
return major === 1 && minor >= 10 && minor <= 11;
}

handleOpenWebsite = () => {
Expand Down Expand Up @@ -275,7 +275,7 @@ class Connection extends Component {
<div className={ styles.info }>
<FormattedMessage
id='connection.incorrectVersion'
defaultMessage='We found parity version {version} running. Parity UI requires parity >=1.10 to run. Please visit {link} to install Parity 1.10 first.'
defaultMessage='We found parity version {version} running. This version of Parity UI requires Parity 1.10 or 1.11 to run. Please either upgrade Parity UI, or visit {link} to install the correct version of Parity.'
values={ {
link: <a href='#' onClick={ this.handleOpenWebsite }>https://parity.io</a>,
version: `${major}.${minor}.${patch}`
Expand Down