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

Push precompiled to correct branch (v1) (#7031)

Browse Source
This commit is contained in:
Jaco Greeff 2017-11-13 10:43:12 +01:00 committed by GitHub
parent 6997ddda89
commit 1749dd8d6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
js-old/scripts/release.sh
View File

@ -3,8 +3,7 @@ set -e
# variables # variables
UTCDATE=`date -u "+%Y%m%d-%H%M%S"` UTCDATE=`date -u "+%Y%m%d-%H%M%S"`
PACKAGES=( "parity" "etherscan" "shapeshift" "jsonrpc" ) PRECOMPILED_BRANCH="v1"
BRANCH="v1"
GIT_JS_PRECOMPILED="https://${GITHUB_JS_PRECOMPILED}:@github.com/paritytech/js-precompiled.git" GIT_JS_PRECOMPILED="https://${GITHUB_JS_PRECOMPILED}:@github.com/paritytech/js-precompiled.git"
GIT_PARITY="https://${GITHUB_JS_PRECOMPILED}:@github.com/paritytech/parity.git" GIT_PARITY="https://${GITHUB_JS_PRECOMPILED}:@github.com/paritytech/parity.git"
@ -23,21 +22,21 @@ pushd $BASEDIR
cd ../.dist cd ../.dist
# add local files and send it up # add local files and send it up
echo "*** Setting up GitHub config for js-precompiled" echo "*** [v1] Setting up GitHub config for js-precompiled"
rm -rf ./.git rm -rf ./.git
git init git init
setup_git_user setup_git_user
echo "*** Checking out $BRANCH branch" echo "*** [v1] Checking out $PRECOMPILED_BRANCH branch"
git remote add origin $GIT_JS_PRECOMPILED git remote add origin $GIT_JS_PRECOMPILED
git fetch origin 2>$GITLOG git fetch origin 2>$GITLOG
git checkout -b $BRANCH git checkout -b $PRECOMPILED_BRANCH
echo "*** Committing compiled files for $UTCDATE" echo "*** [v1] Committing compiled files for $UTCDATE"
mv build ../build.new mv build ../build.new
git add . git add .
git commit -m "$UTCDATE [update]" git commit -m "$UTCDATE [update]"
git merge origin/$BRANCH -X ours --commit -m "$UTCDATE [merge]" git merge origin/$PRECOMPILED_BRANCH -X ours --commit -m "$UTCDATE [merge]"
git rm -r build git rm -r build
rm -rf build rm -rf build
git commit -m "$UTCDATE [cleanup]" git commit -m "$UTCDATE [cleanup]"
@ -45,34 +44,33 @@ mv ../build.new build
git add . git add .
git commit -m "$UTCDATE [release]" git commit -m "$UTCDATE [release]"
echo "*** Merging remote" echo "*** [v1] Merging remote"
git push origin HEAD:refs/heads/$BRANCH 2>$GITLOG git push origin HEAD:refs/heads/$PRECOMPILED_BRANCH 2>$GITLOG
PRECOMPILED_HASH=`git rev-parse HEAD` PRECOMPILED_HASH=`git rev-parse HEAD`
# move to root # move to root
cd ../.. cd ../..
echo "*** Setting up GitHub config for parity" echo "*** [v1] Setting up GitHub config for parity"
setup_git_user setup_git_user
git remote set-url origin $GIT_PARITY git remote set-url origin $GIT_PARITY
git reset --hard origin/$BRANCH 2>$GITLOG git reset --hard origin/$BRANCH 2>$GITLOG
echo "*** Updating cargo parity-ui-old-precompiled#$PRECOMPILED_HASH" echo "*** [v1] Updating cargo parity-ui-old-precompiled#$PRECOMPILED_HASH"
git submodule update git submodule update
# Not needed since $BRANCH is hardcoded # Not needed since $BRANCH is hardcoded
# sed -i "/^parity-ui-old-precompiled/ { s/branch = \".*\"/branch = \"$BRANCH\"/g; }" dapps/ui/Cargo.toml # sed -i "/^parity-ui-old-precompiled/ { s/branch = \".*\"/branch = \"$BRANCH\"/g; }" dapps/ui/Cargo.toml
cargo update -p parity-ui-old-precompiled cargo update -p parity-ui-old-precompiled
# --precise "$PRECOMPILED_HASH" # --precise "$PRECOMPILED_HASH"
echo "*** Committing updated files" echo "*** [v1] Committing updated files"
git add js
git add dapps/ui/Cargo.toml git add dapps/ui/Cargo.toml
git add Cargo.lock git add Cargo.lock
git commit -m "[ci skip] js-precompiled $UTCDATE" git commit -m "[ci skip] js-precompiled $UTCDATE"
git push origin HEAD:refs/heads/$BRANCH 2>$GITLOG git push origin HEAD:refs/heads/$BRANCH 2>$GITLOG
# back to root # back to root
echo "*** Release completed" echo "*** [v1] Release completed"
popd popd
# exit with exit code # exit with exit code

34
js/scripts/release.sh
View File

@ -3,7 +3,6 @@ set -e
# variables # variables
UTCDATE=`date -u "+%Y%m%d-%H%M%S"` UTCDATE=`date -u "+%Y%m%d-%H%M%S"`
PACKAGES=()
BRANCH=$CI_BUILD_REF_NAME BRANCH=$CI_BUILD_REF_NAME
GIT_JS_PRECOMPILED="https://${GITHUB_JS_PRECOMPILED}:@github.com/paritytech/js-precompiled.git" GIT_JS_PRECOMPILED="https://${GITHUB_JS_PRECOMPILED}:@github.com/paritytech/js-precompiled.git"
GIT_PARITY="https://${GITHUB_JS_PRECOMPILED}:@github.com/paritytech/parity.git" GIT_PARITY="https://${GITHUB_JS_PRECOMPILED}:@github.com/paritytech/parity.git"
@ -23,17 +22,17 @@ pushd $BASEDIR
cd ../.dist cd ../.dist
# add local files and send it up # add local files and send it up
echo "*** Setting up GitHub config for js-precompiled" echo "*** [v2] Setting up GitHub config for js-precompiled"
rm -rf ./.git rm -rf ./.git
git init git init
setup_git_user setup_git_user
echo "*** Checking out $BRANCH branch" echo "*** [v2] Checking out $BRANCH branch"
git remote add origin $GIT_JS_PRECOMPILED git remote add origin $GIT_JS_PRECOMPILED
git fetch origin 2>$GITLOG git fetch origin 2>$GITLOG
git checkout -b $BRANCH git checkout -b $BRANCH
echo "*** Committing compiled files for $UTCDATE" echo "*** [v2] Committing compiled files for $UTCDATE"
mv build ../build.new mv build ../build.new
git add . git add .
git commit -m "$UTCDATE [update]" git commit -m "$UTCDATE [update]"
@ -45,14 +44,14 @@ mv ../build.new build
git add . git add .
git commit -m "$UTCDATE [release]" git commit -m "$UTCDATE [release]"
echo "*** Merging remote" echo "*** [v2] Merging remote"
git push origin HEAD:refs/heads/$BRANCH 2>$GITLOG git push origin HEAD:refs/heads/$BRANCH 2>$GITLOG
PRECOMPILED_HASH=`git rev-parse HEAD` PRECOMPILED_HASH=`git rev-parse HEAD`
# move to root # move to root
cd ../.. cd ../..
echo "*** Setting up GitHub config for parity" echo "*** [v2] Setting up GitHub config for parity"
setup_git_user setup_git_user
git remote set-url origin $GIT_PARITY git remote set-url origin $GIT_PARITY
git reset --hard origin/$BRANCH 2>$GITLOG git reset --hard origin/$BRANCH 2>$GITLOG
@ -60,35 +59,20 @@ git reset --hard origin/$BRANCH 2>$GITLOG
if [ "$BRANCH" == "master" ]; then if [ "$BRANCH" == "master" ]; then
cd js cd js
echo "*** Bumping package.json patch version" echo "*** [v2] Bumping package.json patch version"
npm --no-git-tag-version version npm --no-git-tag-version version
npm version patch npm version patch
echo "*** Building packages for npmjs"
echo "$NPM_TOKEN" >> ~/.npmrc
for PACKAGE in ${PACKAGES[@]}
do
echo "*** Building $PACKAGE"
LIBRARY=$PACKAGE npm run ci:build:npm
DIRECTORY=.npmjs/$PACKAGE
echo "*** Publishing $PACKAGE from $DIRECTORY"
cd $DIRECTORY
npm publish --access public || true
cd ../..
done
cd .. cd ..
fi fi
echo "*** Updating cargo parity-ui-precompiled#$PRECOMPILED_HASH" echo "*** [v2] Updating cargo parity-ui-precompiled#$PRECOMPILED_HASH"
git submodule update git submodule update
sed -i "/^parity-ui-precompiled/ { s/branch = \".*\"/branch = \"$BRANCH\"/g; }" dapps/ui/Cargo.toml sed -i "/^parity-ui-precompiled/ { s/branch = \".*\"/branch = \"$BRANCH\"/g; }" dapps/ui/Cargo.toml
cargo update -p parity-ui-precompiled cargo update -p parity-ui-precompiled
# --precise "$PRECOMPILED_HASH" # --precise "$PRECOMPILED_HASH"
echo "*** Committing updated files" echo "*** [v2] Committing updated files"
git add js git add js
git add dapps/ui/Cargo.toml git add dapps/ui/Cargo.toml
git add Cargo.lock git add Cargo.lock
@ -96,7 +80,7 @@ git commit -m "[ci skip] js-precompiled $UTCDATE"
git push origin HEAD:refs/heads/$BRANCH 2>$GITLOG git push origin HEAD:refs/heads/$BRANCH 2>$GITLOG
# back to root # back to root
echo "*** Release completed" echo "*** [v2] Release completed"
popd popd
# exit with exit code # exit with exit code

2
js/scripts/test.js
View File

@ -1 +1 @@
// test script 14 // test script 15