From 688b7926bcb2a293eb6e58d49a98a576d2450e79 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 12 Feb 2018 10:50:04 +0100 Subject: [PATCH 1/4] Sed replace fix (no . in date) --- publish-wasm.sh | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/publish-wasm.sh b/publish-wasm.sh index cc4238a374a11..665a626920f4a 100755 --- a/publish-wasm.sh +++ b/publish-wasm.sh @@ -7,7 +7,7 @@ REPO_AUTH="${GH_TOKEN}:@${REPO}" SRCS=( "polkadot/runtime/wasm" "substrate/executor/wasm" "substrate/test-runtime/wasm" ) DST=".wasm-binaries" TARGET="wasm32-unknown-unknown" -UTCDATE=`date -u "+%Y%m%d.%H%M%S"` +UTCDATE=`date -u "+%Y%m%d%H%M%S"` pushd . @@ -24,11 +24,11 @@ do cd ../../.. done -if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_BRANCH" != "master" ]; then - popd - echo "*** Skipping wasm binary publish" - exit 0 -fi +# if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_BRANCH" != "master" ]; then +# popd +# echo "*** Skipping wasm binary publish" +# exit 0 +# fi echo "*** Cloning repo" rm -rf $DST @@ -52,10 +52,17 @@ done if [ -f "package.json" ]; then echo "*** Updating package.json" - sed -i '.bak' "s/\"version\": \"[0-9.]*\"/\"version\": \"$UTCDATE\"/g" package.json + sed -i '.bak' "s/\"version\": \".*\"/\"version\": \"$UTCDATE\"/g" package.json rm -rf package.json.bak fi +if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_BRANCH" != "master" ]; then + popd + echo "*** Skipping wasm binary publish" + exit 0 +fi + + echo "*** Adding to git" echo "$UTCDATE" > README.md git add --all . From a2d191df3f3dd35ccb73e856600b1ca37f5841ad Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 12 Feb 2018 11:22:42 +0100 Subject: [PATCH 2/4] Debug sed --- publish-wasm.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/publish-wasm.sh b/publish-wasm.sh index 665a626920f4a..6b250146fa93e 100755 --- a/publish-wasm.sh +++ b/publish-wasm.sh @@ -52,6 +52,7 @@ done if [ -f "package.json" ]; then echo "*** Updating package.json" + echo "sed -i '.bak' s/\"version\": \".*\"/\"version\": \"$UTCDATE\"/g package.json" sed -i '.bak' "s/\"version\": \".*\"/\"version\": \"$UTCDATE\"/g" package.json rm -rf package.json.bak fi From 019448eb71e859fb4916246541ea5b81684728da Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 12 Feb 2018 11:47:06 +0100 Subject: [PATCH 3/4] Explicit -e option --- publish-wasm.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/publish-wasm.sh b/publish-wasm.sh index 6b250146fa93e..d0cbfd9ff1c10 100755 --- a/publish-wasm.sh +++ b/publish-wasm.sh @@ -7,7 +7,7 @@ REPO_AUTH="${GH_TOKEN}:@${REPO}" SRCS=( "polkadot/runtime/wasm" "substrate/executor/wasm" "substrate/test-runtime/wasm" ) DST=".wasm-binaries" TARGET="wasm32-unknown-unknown" -UTCDATE=`date -u "+%Y%m%d%H%M%S"` +UTCDATE=`date -u "+%Y%m%d.%H%M%S"` pushd . @@ -52,8 +52,7 @@ done if [ -f "package.json" ]; then echo "*** Updating package.json" - echo "sed -i '.bak' s/\"version\": \".*\"/\"version\": \"$UTCDATE\"/g package.json" - sed -i '.bak' "s/\"version\": \".*\"/\"version\": \"$UTCDATE\"/g" package.json + sed -i -e "s/\"version\": \"[0-9.]*\"/\"version\": \"$UTCDATE\"/g" package.json rm -rf package.json.bak fi From 7b57648cf06b9371c9eb5156ac4b3b71419dc406 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 12 Feb 2018 12:06:46 +0100 Subject: [PATCH 4/4] Update sed --- publish-wasm.sh | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/publish-wasm.sh b/publish-wasm.sh index d0cbfd9ff1c10..42f60619200ce 100755 --- a/publish-wasm.sh +++ b/publish-wasm.sh @@ -24,11 +24,11 @@ do cd ../../.. done -# if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_BRANCH" != "master" ]; then -# popd -# echo "*** Skipping wasm binary publish" -# exit 0 -# fi +if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_BRANCH" != "master" ]; then + popd + echo "*** Skipping wasm binary publish" + exit 0 +fi echo "*** Cloning repo" rm -rf $DST @@ -56,13 +56,6 @@ if [ -f "package.json" ]; then rm -rf package.json.bak fi -if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_BRANCH" != "master" ]; then - popd - echo "*** Skipping wasm binary publish" - exit 0 -fi - - echo "*** Adding to git" echo "$UTCDATE" > README.md git add --all .