From b7862ac23a021f0f10a7e8212450d1cddd243d51 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 13 Mar 2017 12:52:02 +0100 Subject: [PATCH] Update parity-ui-precompiled with branch (#4850) * Update parity-ui-precompiled with branch * In-place sed via -i * Explicitly specify branch * Only in-place edit branch (thanks @ngotchac) * Add override & single-line comment --- dapps/ui/Cargo.toml | 3 ++- js/scripts/release.sh | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dapps/ui/Cargo.toml b/dapps/ui/Cargo.toml index 2ab128ad5..17fc2d448 100644 --- a/dapps/ui/Cargo.toml +++ b/dapps/ui/Cargo.toml @@ -11,7 +11,8 @@ rustc_version = "0.1" [dependencies] parity-ui-dev = { path = "../../js", optional = true } -parity-ui-precompiled = { git = "https://github.com/ethcore/js-precompiled.git", optional = true } +# This is managed by the js/scripts/release.sh script on CI - keep it in a single line +parity-ui-precompiled = { git = "https://github.com/ethcore/js-precompiled.git", optional = true, branch = "master" } [features] no-precompiled-js = ["parity-ui-dev"] diff --git a/js/scripts/release.sh b/js/scripts/release.sh index 80c0fc819..be19e217e 100755 --- a/js/scripts/release.sh +++ b/js/scripts/release.sh @@ -89,11 +89,13 @@ fi echo "*** Updating cargo parity-ui-precompiled#$PRECOMPILED_HASH" git submodule update +sed -i "/^parity-ui-precompiled/ { s/branch = \".*\"/branch = \"$BRANCH\"/g; }" dapps/ui/Cargo.toml cargo update -p parity-ui-precompiled # --precise "$PRECOMPILED_HASH" echo "*** Committing updated files" git add js +git add dapps/ui/Cargo.toml git add Cargo.lock git commit -m "[ci skip] js-precompiled $UTCDATE" git push origin HEAD:refs/heads/$BRANCH 2>$GITLOG