diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -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 | 4 | ||||
| -rwxr-xr-x | scripts/docker_deploy.sh | 16 | ||||
| -rw-r--r-- | scripts/travis-emscripten/deploy_key.enc | bin | 1680 -> 1680 bytes | |||
| -rwxr-xr-x | scripts/travis-emscripten/publish_binary.sh | 6 |
7 files changed, 21 insertions, 21 deletions
diff --git a/.travis.yml b/.travis.yml index ef4f8b39..68448ad3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ branches: env: global: - - ENCRYPTION_LABEL="6d4541b72666" + - ENCRYPTION_LABEL="671c80db" - SOLC_BUILD_TYPE=RelWithDebInfo - SOLC_EMSCRIPTEN=Off - SOLC_INSTALL_DEPS_TRAVIS=On @@ -209,7 +209,7 @@ deploy: # This runs for each tag that is created and adds the corresponding files. - provider: releases api_key: - secure: PWH37xVBCF0XiSjl+eH7XIdkrfxZXjzvqF4PiBOnD3VnFz+odrdnIwBmCeBYTHTWF8efpp8fmzWJk2UVq1JcpyZiC+SVxO8dx91W2ia1a+wKrEQuDgkUrZBkl5IQNCv0QS81DDQhliyZEaYh8wHO/7RReyMpGpw2U2u85WkFiZ+LdlHEZPfzUeh9lxQ9n8qwFL8Rja+Q05d4cQ8zaVEtofJJT4T6DUWhc3TzuxDYxOmjwg37rC9CkGSLn6VadSh8b3j5R0SZupFsAEvBL/imBLP9r9ewoo7o4p6By3jwiIgH9yNg7LM618xbffcNaYF/KtLBi9uPHfqF7hRD4PlECz+D0PR78nQItOX5HKm1QMg5kCnghRVCA0IVjpV5fiYQnMLM7dCRv34I5b3zLpa69wQ/GLYB2FViqNUfvPeiZTEeIJ2OmATlFx8AH2JoqpY1XJknWb35+vMfa8LSiJJW++SLWeV+ncC92hrvyZ1cy3trepRRZIfyYepxHifnfdWMkddQUJk5b2WS5Fy/TJLZNPeombnpvRhUC38dsYItarKeXTc6k4oADCEDZ2rgGIcEiqRxXV11Y5xHJekLDWzUs+YJNcCuL4pnAP//LOnbnH2w9rLpwhQYSl0anCd097NivAXQJXO2JI/byIYz1kiCVQWnW6EM8+72mLOklf/Qr8k= + secure: a9uTfknSgEtpdR/SbdkWef9IdpqDN2rcWCzfcR5i2ZRWlzfA9OMmLKndUR2pLagIVgyDtjVyB/2XwOxq0BX8f2H5u8bLt0BhEz8wf+fFnJ5M9Lv0feV+n8FZNfAKOUhxeBcJ6R+PF/gQCUAqxAT6lG429+khvsMVDu67vsjcXsiNW4jD8M6c1iwzL4jd0qHcsnUHZZRf45/VlGWOOw2E6ztCP6OeURLPa/IkYnVLsq+YIgORGMpJJeyO18KggnMHq2YrinpzjguRGDsA1Y3R6WFNDoMi5DT1wHKFMUeTNuDsyyY5e6dpJx9yiLtcCAxKr8ExWerxqzYLWkKfmqUpbGcN7Sx0+m4Zcf5YnCx/7rMWGcw0dpP3FOCNC+4Pt4L3WZFnyxma1i6n6tUP7OzDbQHrfPfv9BZQKyQV/usF1ZJiF/EQnMIwv+C/s21F0De+Va3tHY8sbixwDuheG/cb3v3BGT0v6Z/hu95EG9QG+pBgubSQiXOBYSMceHxEuZUWE5AQJTWV/fFXLhzVeRgkMOHCMUBg7Jkg61drtZsnP6CosxgwM+4WxY+OEXALvZ4EPd+NYE9O6QPDzIoplSiw0BWKaOaNEojGuprOn49Q3K+MRnG/H7NiKJpIPEvMwi/0GfsGc5aQcjwx8TieJ4T1muRr60HzxHN3T01Xst+534Y= overwrite: true file_glob: true 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 ccf6e60e..cca7d0bb 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. @@ -92,15 +92,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 22657a8c..b179359f 100755 --- a/scripts/docker_build.sh +++ b/scripts/docker_build.sh @@ -2,7 +2,7 @@ set -e -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 diff --git a/scripts/docker_deploy.sh b/scripts/docker_deploy.sh index 00705725..c8a3c28e 100755 --- a/scripts/docker_deploy.sh +++ b/scripts/docker_deploy.sh @@ -6,16 +6,16 @@ docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"; version=$($(dirname "$0")/get_version.sh) if [ "$TRAVIS_BRANCH" = "develop" ] then - docker tag ethereum/solc:build ethereum/solc:nightly; - docker tag ethereum/solc:build ethereum/solc:nightly-"$version"-"$TRAVIS_COMMIT" - docker push ethereum/solc:nightly-"$version"-"$TRAVIS_COMMIT"; - docker push ethereum/solc:nightly; + docker tag dexonfoundation/dsolc:build dexonfoundation/dsolc:nightly; + docker tag dexonfoundation/dsolc:build dexonfoundation/dsolc:nightly-"$version"-"$TRAVIS_COMMIT" + docker push dexonfoundation/dsolc:nightly-"$version"-"$TRAVIS_COMMIT"; + docker push dexonfoundation/dsolc:nightly; elif [ "$TRAVIS_TAG" = v"$version" ] then - docker tag ethereum/solc:build ethereum/solc:stable; - docker tag ethereum/solc:build ethereum/solc:"$version"; - docker push ethereum/solc:stable; - docker push ethereum/solc:"$version"; + docker tag dexonfoundation/dsolc:build dexonfoundation/dsolc:stable; + docker tag dexonfoundation/dsolc:build dexonfoundation/dsolc:"$version"; + docker push dexonfoundation/dsolc:stable; + docker push dexonfoundation/dsolc:"$version"; else echo "Not publishing docker image from branch $TRAVIS_BRANCH or tag $TRAVIS_TAG" fi 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 |