From 000e6dee8712e3d69501793981735df27b214d92 Mon Sep 17 00:00:00 2001 From: Denton Liu Date: Mon, 29 Aug 2016 14:36:19 -0400 Subject: [PATCH 1/3] Revert "Use builtin variable" This reverts commit 0a3d3fcce0fcb07d8ab080d8b1fa9548a2757a9c. This was done because @bobsummerwill brought up in ethereum/solidity#952 that a longer hash may not be desired. --- ci/deploy_from_travis.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ci/deploy_from_travis.sh b/ci/deploy_from_travis.sh index 4f1fde7bbb..f6ae070502 100755 --- a/ci/deploy_from_travis.sh +++ b/ci/deploy_from_travis.sh @@ -2,18 +2,20 @@ set -e +SHA=`git rev-parse --verify HEAD` + git config user.name "$COMMIT_AUTHOR" git config user.email "$COMMIT_AUTHOR_EMAIL" git checkout --orphan gh-pages git rm --cached -r . echo "# Automatic build" > README.md -echo "Built website from {$TRAVIS_COMMIT}. See https://github.com/ethereum/browser-solidity/ for details." >> README.md -echo "To use an offline copy, download browser-solidity-$TRAVIS_COMMIT.zip." >> README.md +echo "Built website from {$SHA}. See https://github.com/ethereum/browser-solidity/ for details." >> README.md +echo "To use an offline copy, download browser-solidity-$SHA.zip." >> README.md # ZIP the whole directory -zip -r browser-solidity-$TRAVIS_COMMIT.zip $FILES_TO_PACKAGE +zip -r browser-solidity-$SHA.zip $FILES_TO_PACKAGE # -f is needed because "build" is part of .gitignore -git add -f $FILES_TO_PACKAGE browser-solidity-$TRAVIS_COMMIT.zip -git commit -m "Built website from {$TRAVIS_COMMIT}." +git add -f $FILES_TO_PACKAGE browser-solidity-$SHA.zip +git commit -m "Built website from {$SHA}." ENCRYPTED_KEY_VAR="encrypted_${ENCRYPTION_LABEL}_key" ENCRYPTED_IV_VAR="encrypted_${ENCRYPTION_LABEL}_iv" From 0df82b6b316db754171e9f03d9f5b171d24cb32e Mon Sep 17 00:00:00 2001 From: Denton Liu Date: Mon, 29 Aug 2016 14:40:05 -0400 Subject: [PATCH 2/3] Change {} to `` for code highlighting --- ci/deploy_from_travis.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/deploy_from_travis.sh b/ci/deploy_from_travis.sh index f6ae070502..3f0f0641a9 100755 --- a/ci/deploy_from_travis.sh +++ b/ci/deploy_from_travis.sh @@ -9,8 +9,8 @@ git config user.email "$COMMIT_AUTHOR_EMAIL" git checkout --orphan gh-pages git rm --cached -r . echo "# Automatic build" > README.md -echo "Built website from {$SHA}. See https://github.com/ethereum/browser-solidity/ for details." >> README.md -echo "To use an offline copy, download browser-solidity-$SHA.zip." >> README.md +echo "Built website from \`$SHA\`. See https://github.com/ethereum/browser-solidity/ for details." >> README.md +echo "To use an offline copy, download \`browser-solidity-$SHA.zip\`." >> README.md # ZIP the whole directory zip -r browser-solidity-$SHA.zip $FILES_TO_PACKAGE # -f is needed because "build" is part of .gitignore From 19eb2a98083813220185d43b65d9394a4e516c73 Mon Sep 17 00:00:00 2001 From: Denton Liu Date: Wed, 31 Aug 2016 18:00:45 -0400 Subject: [PATCH 3/3] Fix typo --- ci/deploy_from_travis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/deploy_from_travis.sh b/ci/deploy_from_travis.sh index 3f0f0641a9..3f7de2b9bc 100755 --- a/ci/deploy_from_travis.sh +++ b/ci/deploy_from_travis.sh @@ -2,7 +2,7 @@ set -e -SHA=`git rev-parse --verify HEAD` +SHA=`git rev-parse --short --verify HEAD` git config user.name "$COMMIT_AUTHOR" git config user.email "$COMMIT_AUTHOR_EMAIL"