aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei-Ning Huang <w@dexon.org>2018-11-21 16:33:15 +0800
committerJimmy Hu <jimmy.hu@dexon.org>2018-12-06 14:54:32 +0800
commitd7688b8099c9f4223d288ebaabc02061734c70da (patch)
treedd64c72ccc6f9f6e5615c4a2528fc1f64fa942ac
parent9c6aeb947bbc9f0253cdcd2759d08fdf0fba76b0 (diff)
downloaddexon-solidity-d7688b8099c9f4223d288ebaabc02061734c70da.tar
dexon-solidity-d7688b8099c9f4223d288ebaabc02061734c70da.tar.gz
dexon-solidity-d7688b8099c9f4223d288ebaabc02061734c70da.tar.bz2
dexon-solidity-d7688b8099c9f4223d288ebaabc02061734c70da.tar.lz
dexon-solidity-d7688b8099c9f4223d288ebaabc02061734c70da.tar.xz
dexon-solidity-d7688b8099c9f4223d288ebaabc02061734c70da.tar.zst
dexon-solidity-d7688b8099c9f4223d288ebaabc02061734c70da.zip
Update CI settingsv0.5.1
-rw-r--r--.travis.yml4
-rw-r--r--scripts/bytecodecompare/deploy_key.encbin1680 -> 1680 bytes
-rwxr-xr-xscripts/bytecodecompare/storebytecode.sh12
-rwxr-xr-xscripts/docker_build.sh7
-rwxr-xr-xscripts/docker_deploy.sh2
-rw-r--r--scripts/travis-emscripten/deploy_key.encbin1680 -> 1680 bytes
-rwxr-xr-xscripts/travis-emscripten/publish_binary.sh6
7 files changed, 15 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml
index d68c79ba..291901bc 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
index acab2a27..6eddd601 100644
--- a/scripts/bytecodecompare/deploy_key.enc
+++ b/scripts/bytecodecompare/deploy_key.enc
Binary files differ
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
index e6e9e0e6..6eddd601 100644
--- a/scripts/travis-emscripten/deploy_key.enc
+++ b/scripts/travis-emscripten/deploy_key.enc
Binary files differ
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