diff options
author | Wei-Ning Huang <w@dexon.org> | 2018-11-21 16:33:15 +0800 |
---|---|---|
committer | Jimmy Hu <jimmy.hu@dexon.org> | 2019-04-13 20:54:33 +0800 |
commit | 555c842d6970d8844b0d2a9055b279096e7dbf83 (patch) | |
tree | 4c2612d9880df56ca870f1e28356608e2ad5ef5c /scripts | |
parent | 6d1f61b651503210f9125903a51a18d1fba9708d (diff) | |
download | dexon-solidity-555c842d6970d8844b0d2a9055b279096e7dbf83.tar.gz dexon-solidity-555c842d6970d8844b0d2a9055b279096e7dbf83.tar.zst dexon-solidity-555c842d6970d8844b0d2a9055b279096e7dbf83.zip |
Update CI settings
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/bytecodecompare/deploy_key.enc | bin | 1680 -> 1680 bytes | |||
-rwxr-xr-x | scripts/bytecodecompare/storebytecode.sh | 12 | ||||
-rwxr-xr-x | scripts/docker_build.sh | 7 | ||||
-rwxr-xr-x | scripts/docker_deploy.sh | 2 | ||||
-rw-r--r-- | scripts/travis-emscripten/deploy_key.enc | bin | 1680 -> 1680 bytes | |||
-rwxr-xr-x | scripts/travis-emscripten/publish_binary.sh | 6 |
6 files changed, 13 insertions, 14 deletions
diff --git a/scripts/bytecodecompare/deploy_key.enc b/scripts/bytecodecompare/deploy_key.enc Binary files differindex acab2a27..6eddd601 100644 --- a/scripts/bytecodecompare/deploy_key.enc +++ b/scripts/bytecodecompare/deploy_key.enc diff --git a/scripts/bytecodecompare/storebytecode.sh b/scripts/bytecodecompare/storebytecode.sh index 4208d67f..3bc5d666 100755 --- a/scripts/bytecodecompare/storebytecode.sh +++ b/scripts/bytecodecompare/storebytecode.sh @@ -3,8 +3,8 @@ #------------------------------------------------------------------------------ # Script used for cross-platform comparison as part of the travis automation. # Splits all test source code into multiple files, generates bytecode and -# uploads the bytecode into github.com/ethereum/solidity-test-bytecode where -# another travis job is triggered to do the actual comparison. +# uploads the bytecode into github.com/dexon-foundation/solidity-test-bytecode +# where another travis job is triggered to do the actual comparison. # # ------------------------------------------------------------------------------ # This file is part of solidity. @@ -98,15 +98,15 @@ EOF if [ "$TRAVIS_SECURE_ENV_VARS" = "true" ] then - openssl aes-256-cbc -K $encrypted_60701c962b9c_key -iv $encrypted_60701c962b9c_iv -in "$REPO_ROOT"/scripts/bytecodecompare/deploy_key.enc -out deploy_key -d + openssl aes-256-cbc -K $encrypted_671c80db_key -iv $encrypted_671c80db_iv -in "$REPO_ROOT"/scripts/bytecodecompare/deploy_key.enc -out deploy_key -d chmod 600 deploy_key eval `ssh-agent -s` ssh-add deploy_key - git clone --depth 2 git@github.com:ethereum/solidity-test-bytecode.git + git clone --depth 2 git@github.com:dexon-foundation/solidity-test-bytecode.git cd solidity-test-bytecode - git config user.name "travis" - git config user.email "chris@ethereum.org" + git config user.name "Travis CI" + git config user.email "dev@dexon.org" git clean -f -d -x DIRNAME=$(cd "$REPO_ROOT" && git show -s --format="%cd-%H" --date=short) diff --git a/scripts/docker_build.sh b/scripts/docker_build.sh index 9eedec34..7400bd4c 100755 --- a/scripts/docker_build.sh +++ b/scripts/docker_build.sh @@ -2,11 +2,10 @@ set -e -# Scratch image -docker build -t ethereum/solc:build -f scripts/Dockerfile . -tmp_container=$(docker create ethereum/solc:build sh) +docker build -t dexonfoundation/dsolc:build -f scripts/Dockerfile . +tmp_container=$(docker create dexonfoundation/dsolc:build sh) mkdir -p upload docker cp ${tmp_container}:/usr/bin/solc upload/solc-static-linux # Alpine image -docker build -t ethereum/solc:build-alpine -f scripts/Dockerfile_alpine . +docker build -t dexonfoundation/dsolc:build-alpine -f scripts/Dockerfile_alpine . diff --git a/scripts/docker_deploy.sh b/scripts/docker_deploy.sh index 36e918cf..828b7dd9 100755 --- a/scripts/docker_deploy.sh +++ b/scripts/docker_deploy.sh @@ -2,7 +2,7 @@ set -e -image="ethereum/solc" +image="dexonfoundation/dsolc" tag_and_push() { diff --git a/scripts/travis-emscripten/deploy_key.enc b/scripts/travis-emscripten/deploy_key.enc Binary files differindex e6e9e0e6..6eddd601 100644 --- a/scripts/travis-emscripten/deploy_key.enc +++ b/scripts/travis-emscripten/deploy_key.enc diff --git a/scripts/travis-emscripten/publish_binary.sh b/scripts/travis-emscripten/publish_binary.sh index dd23330b..a5f49af6 100755 --- a/scripts/travis-emscripten/publish_binary.sh +++ b/scripts/travis-emscripten/publish_binary.sh @@ -28,7 +28,7 @@ # (c) 2016 solidity contributors. #------------------------------------------------------------------------------ -set -e +set -x VER=$(cat CMakeLists.txt | grep 'set(PROJECT_VERSION' | sed -e 's/.*set(PROJECT_VERSION "\(.*\)".*/\1/') test -n "$VER" @@ -50,8 +50,8 @@ ssh-add deploy_key git clone --depth 2 git@github.com:dexon-foundation/dsolc-bin.git cd dsolc-bin -git config user.name "Jimmy Hu" -git config user.email "jimmy.hu@dexon.org" +git config user.name "Travis CI" +git config user.email "dev@dexon.org" git checkout -B gh-pages origin/gh-pages git clean -f -d -x |