diff --git a/.circleci/config.yml b/.circleci/config.yml index f939586ae..ee85d2e25 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -657,7 +657,7 @@ jobs: - run: name: Build command: | - scripts/travis-emscripten/build_emscripten.sh + scripts/ci/build_emscripten.sh - store_artifacts: path: emscripten_build/libsolc/soljson.js destination: soljson.js diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index f9105e246..000000000 --- a/.travis.yml +++ /dev/null @@ -1,250 +0,0 @@ -#------------------------------------------------------------------------------ -# TravisCI configuration file for solidity. -# -# The documentation for solidity is hosted at: -# -# http://solidity.readthedocs.org -# -# ------------------------------------------------------------------------------ -# This file is part of solidity. -# -# solidity is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# solidity is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with solidity. If not, see -# -# (c) 2016-2017 solidity contributors. -#------------------------------------------------------------------------------ - -language: cpp - -branches: - # We need to whitelist the branches which we want to have "push" automation, - # this includes tags (which are treated as branches by travis). - # Pull request automation is not constrained to this set of branches. - only: - - develop - - release - - /^v[0-9]/ - -env: - global: - - ENCRYPTION_LABEL="6d4541b72666" - - SOLC_BUILD_TYPE=RelWithDebInfo - - SOLC_EMSCRIPTEN=Off - # FIXME: Pushing solcjson.js to solc-bin disabled until we fix the cause of #9261 - - SOLC_PUBLISH_EMSCRIPTEN=Off - - SOLC_INSTALL_DEPS_TRAVIS=On - - SOLC_RELEASE=On - - SOLC_TESTS=On - - SOLC_STOREBYTECODE=Off - - SOLC_DOCKER=Off - - MAKEFLAGS="-j 4" - -matrix: - include: - - os: linux - dist: trusty - sudo: required - compiler: gcc - env: - - ZIP_SUFFIX=ubuntu-trusty - - SOLC_STOREBYTECODE=On - before_install: - - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - - sudo add-apt-repository -y ppa:mhier/libboost-latest - - sudo apt-get update -qq - install: - - sudo apt-get install -qq g++-8 gcc-8 - - sudo apt-get install -qq libboost1.67-dev - - sudo apt-get install -qq libleveldb1 - - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 90 - - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 90 - - - os: linux - dist: trusty - sudo: required - compiler: clang - env: - - ZIP_SUFFIX=ubuntu-trusty-clang - - SOLC_STOREBYTECODE=On - before_install: - - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - - sudo add-apt-repository -y ppa:mhier/libboost-latest - - sudo apt-get update -qq - install: - - sudo apt-get install -qq g++-8 gcc-8 - - sudo apt-get install -qq libboost1.67-dev - - sudo apt-get install -qq libleveldb1 - - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 90 - - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 90 - - # Docker target, which generates a statically linked alpine image - - os: linux - dist: trusty - sudo: required - services: - - docker - env: - - SOLC_DOCKER=On - - SOLC_INSTALL_DEPS_TRAVIS=Off - - SOLC_RELEASE=Off - - SOLC_TESTS=Off - - # Emscripten target, which compiles 'solc' to javascript and uploads the resulting .js - # files to https://github.com/ethereum/solc-bin. These binaries are used in Browser-Solidity - # and in other Ethereum web-based development contexts. - - os: linux - dist: trusty - sudo: required - compiler: gcc - node_js: - - "10" - services: - - docker - before_install: - - nvm install 10 - - nvm use 10 - - docker pull solbuildpackpusher/solidity-buildpack-deps@sha256:23dad3b34deae8107c8551804ef299f6a89c23ed506e8118fac151e2bdc9018c - env: - - SOLC_EMSCRIPTEN=On - - SOLC_INSTALL_DEPS_TRAVIS=Off - - SOLC_RELEASE=Off - - SOLC_TESTS=Off - - ZIP_SUFFIX=emscripten - - SOLC_STOREBYTECODE=On - # Travis doesn't seem to support "dynamic" cache keys where we could include - # the hashes of certain files. Our CircleCI configuration contains the hash of - # relevant emscripten files. - # - # It is important to invalidate the cache with each emscripten update, because - # dependencies, such as boost, might be broken otherwise. - # - # This key here has no significant on anything, apart from caching. Please keep - # it in sync with the version above. - - EMSCRIPTEN_VERSION_KEY="1.39.3" - - # OS X Mavericks (10.9) - # https://en.wikipedia.org/wiki/OS_X_Mavericks - # -# Disabled because of problems on travis. -# - os: osx -# osx_image: beta-xcode6.2 -# env: -# - ZIP_SUFFIX=osx-mavericks - - # OS X Yosemite (10.10) - # https://en.wikipedia.org/wiki/OS_X_Yosemite - # -# - os: osx -# osx_image: xcode7.1 -# env: -# # Workaround for "macOS - Yosemite, El Capitan and Sierra hanging?" -# # https://github.com/ethereum/solidity/issues/894 -# - SOLC_TESTS=Off -# - ZIP_SUFFIX=osx-yosemite - - # OS X El Capitan (10.11) - # https://en.wikipedia.org/wiki/OS_X_El_Capitan - # -# - os: osx -# osx_image: xcode7.3 -# env: -# # The use of Debug config here ONLY for El Capitan is a workaround for "The Heisenbug" -# # See https://github.com/ethereum/webthree-umbrella/issues/565 -# - SOLC_BUILD_TYPE=Debug -# # Workaround for "macOS - Yosemite, El Capitan and Sierra hanging?" -# # https://github.com/ethereum/solidity/issues/894 -# - SOLC_TESTS=Off -# - ZIP_SUFFIX=osx-elcapitan - - # macOS Sierra (10.12) - # https://en.wikipedia.org/wiki/MacOS_Sierra - # -# - os: osx -# osx_image: xcode8 -# env: -# # Look like "The Heisenbug" is occurring here too, so we'll do the same workaround. -# # See https://travis-ci.org/ethereum/solidity/jobs/150240930 -# - SOLC_BUILD_TYPE=Debug -# # Workaround for "macOS - Yosemite, El Capitan and Sierra hanging?" -# # https://github.com/ethereum/solidity/issues/894 -# - SOLC_TESTS=Off -# - ZIP_SUFFIX=macos-sierra - -git: - depth: 2 - -cache: - ccache: true - directories: - - boost_1_70_0_install - - $HOME/.local - -install: - - test $SOLC_INSTALL_DEPS_TRAVIS != On || (scripts/install_deps.sh) - - test "$TRAVIS_OS_NAME" != "linux" || (sudo scripts/install_cmake.sh) - -before_script: - # Disable tests unless run on the release branch, on tags or with daily cron - - if [ "$TRAVIS_BRANCH" != release -a -z "$TRAVIS_TAG" -a "$TRAVIS_EVENT_TYPE" != cron ]; then SOLC_TESTS=Off; fi - - if [ "$TRAVIS_BRANCH" = release -o -n "$TRAVIS_TAG" ]; then echo -n > prerelease.txt; else date -u +"nightly.%Y.%-m.%-d" > prerelease.txt; fi - - echo -n "$TRAVIS_COMMIT" > commit_hash.txt - - test $SOLC_EMSCRIPTEN != On || (scripts/build_emscripten.sh) - - test $SOLC_DOCKER != On || (scripts/docker_build.sh) - - test $SOLC_RELEASE != On || (scripts/build.sh $SOLC_BUILD_TYPE -DBoost_USE_STATIC_LIBS=OFF && scripts/create_source_tarball.sh) - -script: - - test $SOLC_EMSCRIPTEN != On -o $SOLC_TESTS != On || (scripts/test_emscripten.sh) - - test $SOLC_TESTS != On || (cd $TRAVIS_BUILD_DIR && scripts/tests.sh) - - test $SOLC_STOREBYTECODE != On || (cd $TRAVIS_BUILD_DIR && scripts/bytecodecompare/storebytecode.sh) - -deploy: - # This is the deploy target for the Emscripten build. - # It publishes the JS file which was compiled as part of the earlier 'build_emscripten.sh' - # step to https://github.com/ethereum/solc-bin/tree/gh-pages/bin. - # Both the build and deploy steps for Emscripten are only run within the Ubuntu - # configurations (not for macOS). That is controlled by conditionals within the bash - # scripts because TravisCI doesn't provide much in the way of conditional logic. - - - provider: script - script: test $SOLC_PUBLISH_EMSCRIPTEN != On || $SOLC_EMSCRIPTEN != On || (scripts/release_emscripten.sh) - skip_cleanup: true - on: - branch: - - develop - - release - # This is the deploy target for the dockerfile. If we are pushing into a develop branch, it will be tagged - # as a nightly and appended the commit of the branch it was pushed in. If we are pushing to master it will - # be tagged as "stable" and given the version tag as well. - - provider: script - script: test $SOLC_DOCKER != On || (scripts/docker_deploy.sh) - skip_cleanup: true - on: - branch: - - develop - - release - - /^v\d/ - # This is the deploy target for the native build (Linux and macOS) - # which generates the source tarball. - # - # 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= - - overwrite: true - file_glob: true - file: $TRAVIS_BUILD_DIR/upload/* - skip_cleanup: true - on: - all_branches: true - tags: true diff --git a/scripts/build_emscripten.sh b/scripts/build_emscripten.sh index cdb07bfb4..c1845b1c6 100755 --- a/scripts/build_emscripten.sh +++ b/scripts/build_emscripten.sh @@ -36,4 +36,4 @@ fi docker run -v $(pwd):/root/project -w /root/project \ solbuildpackpusher/solidity-buildpack-deps@sha256:23dad3b34deae8107c8551804ef299f6a89c23ed506e8118fac151e2bdc9018c\ - ./scripts/travis-emscripten/build_emscripten.sh $BUILD_DIR + ./scripts/ci/build_emscripten.sh $BUILD_DIR diff --git a/scripts/chk_shellscripts/ignore.txt b/scripts/chk_shellscripts/ignore.txt index 098607764..220ed9f57 100644 --- a/scripts/chk_shellscripts/ignore.txt +++ b/scripts/chk_shellscripts/ignore.txt @@ -17,9 +17,7 @@ ./scripts/wasm-rebuild/docker-scripts/patch.sh ./scripts/wasm-rebuild/rebuild.sh ./scripts/build_emscripten.sh -./scripts/travis-emscripten/build_emscripten.sh -./scripts/travis-emscripten/install_deps.sh -./scripts/travis-emscripten/publish_binary.sh +./scripts/ci/build_emscripten.sh ./scripts/docker_build.sh ./scripts/docs_version_pragma_check.sh ./scripts/uniqueErrors.sh diff --git a/scripts/travis-emscripten/build_emscripten.sh b/scripts/ci/build_emscripten.sh similarity index 100% rename from scripts/travis-emscripten/build_emscripten.sh rename to scripts/ci/build_emscripten.sh diff --git a/scripts/docker_build.sh b/scripts/docker_build.sh deleted file mode 100755 index 9eedec344..000000000 --- a/scripts/docker_build.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env sh - -set -e - -# Scratch image -docker build -t ethereum/solc:build -f scripts/Dockerfile . -tmp_container=$(docker create ethereum/solc: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 . diff --git a/scripts/docker_deploy.sh b/scripts/docker_deploy.sh deleted file mode 100755 index 4672accce..000000000 --- a/scripts/docker_deploy.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env sh - -set -e - -image="ethereum/solc" - -tag_and_push() -{ - docker tag "$image:$1" "$image:$2" - docker push "$image:$2" -} - -echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin -version=$($(dirname "$0")/get_version.sh) -if [ "$TRAVIS_BRANCH" = "develop" ] -then - tag_and_push build nightly - tag_and_push build nightly-"$version"-"$TRAVIS_COMMIT" - tag_and_push build-alpine nightly-alpine - tag_and_push build-alpine nightly-alpine-"$version"-"$TRAVIS_COMMIT" -elif [ "$TRAVIS_TAG" = v"$version" ] -then - tag_and_push build stable - tag_and_push build "$version" - tag_and_push build-alpine stable-alpine - tag_and_push build-alpine "$version"-alpine -else - echo "Not publishing docker image from branch $TRAVIS_BRANCH or tag $TRAVIS_TAG" -fi diff --git a/scripts/release_emscripten.sh b/scripts/release_emscripten.sh deleted file mode 100755 index 8db9a0494..000000000 --- a/scripts/release_emscripten.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -#------------------------------------------------------------------------------ -# Bash script which calls the Emscripten "publish binary" script on Ubuntu -# and does nothing on macOS. We should probably merge these two scripts in -# the near future. -# -# The documentation for solidity is hosted at: -# -# https://solidity.readthedocs.org -# -# ------------------------------------------------------------------------------ -# This file is part of solidity. -# -# solidity is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# solidity is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with solidity. If not, see -# -# (c) 2016 solidity contributors. -#------------------------------------------------------------------------------ - -if [[ "$OSTYPE" != "darwin"* ]]; then - ./scripts/travis-emscripten/publish_binary.sh -fi diff --git a/scripts/travis-emscripten/deploy_key.enc b/scripts/travis-emscripten/deploy_key.enc deleted file mode 100644 index e6e9e0e69..000000000 Binary files a/scripts/travis-emscripten/deploy_key.enc and /dev/null differ diff --git a/scripts/travis-emscripten/publish_binary.sh b/scripts/travis-emscripten/publish_binary.sh deleted file mode 100755 index eba3cdac5..000000000 --- a/scripts/travis-emscripten/publish_binary.sh +++ /dev/null @@ -1,99 +0,0 @@ -#!/usr/bin/env bash - -#------------------------------------------------------------------------------ -# Bash script for publishing Solidity Emscripten binaries to Github. -# -# The results are committed to https://github.com/ethereum/solc-bin. -# -# The documentation for solidity is hosted at: -# -# http://solidity.readthedocs.io/ -# -# ------------------------------------------------------------------------------ -# This file is part of solidity. -# -# solidity is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# solidity is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with solidity. If not, see -# -# (c) 2016 solidity contributors. -#------------------------------------------------------------------------------ - -set -e - -VER=$(cat CMakeLists.txt | grep 'set(PROJECT_VERSION' | sed -e 's/.*set(PROJECT_VERSION "\(.*\)".*/\1/') -test -n "$VER" -VER="v$VER" -COMMIT=$(git rev-parse --short=8 HEAD) -DATE=$(date --date="$(git log -1 --date=iso --format=%ad HEAD)" --utc +%Y.%-m.%-d) - -ENCRYPTED_KEY_VAR="encrypted_${ENCRYPTION_LABEL}_key" -ENCRYPTED_IV_VAR="encrypted_${ENCRYPTION_LABEL}_iv" -ENCRYPTED_KEY=${!ENCRYPTED_KEY_VAR} -ENCRYPTED_IV=${!ENCRYPTED_IV_VAR} -openssl aes-256-cbc -K $ENCRYPTED_KEY -iv $ENCRYPTED_IV -in scripts/travis-emscripten/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/solc-bin.git -cd solc-bin -git config user.name "travis" -git config user.email "chris@ethereum.org" -git checkout -B gh-pages origin/gh-pages -git clean -f -d -x - - -FULLVERSION=INVALID -if [ "$TRAVIS_BRANCH" = release ] -then - # We only want one file with this version - if ls ./bin/soljson-"$VER+"*.js - then - echo "Not publishing, we already published this version." - exit 0 - fi - FULLVERSION="$VER+commit.$COMMIT" -elif [ "$TRAVIS_BRANCH" = develop ] -then - # We only want one release per day and we do not want to push the same commit twice. - if ls ./bin/soljson-"$VER-nightly.$DATE"*.js || ls ./bin/soljson-*"commit.$COMMIT.js" - then - echo "Not publishing, we already published this version today." - exit 0 - fi - FULLVERSION="$VER-nightly.$DATE+commit.$COMMIT" -else - echo "Not publishing, wrong branch." - exit 0 -fi - - -NEWFILE="soljson-$FULLVERSION.js" - -# Prepare for update script -npm install - -# This file is assumed to be the product of the build_emscripten.sh script. -cp ../soljson.js ./bin/"$NEWFILE" - -# For releases, add a symlink to the wasm directory. -[ "$TRAVIS_BRANCH" = release ] && ln -sf ../bin/"$NEWFILE" ./wasm/"$NEWFILE" - -# Run update script -npm run update - -# Publish updates -git add ./bin/"$NEWFILE" -[ "$TRAVIS_BRANCH" = release ] && git add ./wasm/"$NEWFILE" -git commit -a -m "Added compiler version $FULLVERSION" -git push origin gh-pages diff --git a/scripts/wasm-rebuild/docker-scripts/rebuild_current.sh b/scripts/wasm-rebuild/docker-scripts/rebuild_current.sh index b48b37fc5..9a28ce30c 100755 --- a/scripts/wasm-rebuild/docker-scripts/rebuild_current.sh +++ b/scripts/wasm-rebuild/docker-scripts/rebuild_current.sh @@ -41,7 +41,7 @@ if [ -d jsoncpp ]; then fi set +e -scripts/travis-emscripten/build_emscripten.sh +scripts/*/build_emscripten.sh set -e mkdir -p upload