grassrootseconomics
/
openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into jg-test-ui

This commit is contained in:
Jaco Greeff 2016-12-08 16:50:23 +01:00
parent 9e8fb616d3 69e010bbf9
commit 507b4b68a1
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -1271,7 +1271,7 @@ dependencies = [
[[package]]
name = "parity-ui-precompiled"
version = "1.4.0"
source = "git+https://github.com/ethcore/js-precompiled.git#1690a80b9f56e33c8344f28eb637bacd97c9da14"
source = "git+https://github.com/ethcore/js-precompiled.git#e5eabdb4f30e9c6bf9b7cb98f0029a71ba202a19"
dependencies = [
"parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
]

2
js/package.json
View File

@ -1,6 +1,6 @@
{
"name": "parity.js",
"version": "0.2.97",
"version": "0.2.98",
"main": "release/index.js",
"jsnext:main": "src/index.js",
"author": "Parity Team <admin@parity.io>",

14
js/scripts/release.sh
View File

@ -35,13 +35,15 @@ git checkout -b $BRANCH
echo "*** Committing compiled files for $UTCDATE"
mv build ../build.new
git pull origin/$BRANCH -X ours --commit -m "$UTCDATE [merge]"
git rm build/*
git commit -m "$UTCDATE [rm]"
mv -f ../build.new/* build/
rm -rf ../build.new
git add .
git commit -m "$UTCDATE"
git commit -m "$UTCDATE [update]"
git merge origin/$BRANCH -X ours --commit -m "$UTCDATE [merge]"
git rm -r build
rm -rf build
git commit -m "$UTCDATE [cleanup]"
mv ../build.new build
git add .
git commit -m "$UTCDATE [release]"
echo "*** Merging remote"
git push origin HEAD:refs/heads/$BRANCH 2>$GITLOG

1
js/scripts/test.js Normal file
View File

@ -0,0 +1 @@
// test script 4