From 3f83bb80bfcf40b7a3c9ca9977eb3859c289e6e9 Mon Sep 17 00:00:00 2001 From: chriseth Date: Thu, 16 Mar 2017 18:36:48 +0100 Subject: Publish soljson and alpine static build on github release page. --- .travis.yml | 12 +++++++----- scripts/create_source_tarball.sh | 3 ++- scripts/release.sh | 4 ++-- scripts/travis-emscripten/build_emscripten.sh | 2 ++ 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index b722dacd..f0a66255 100644 --- a/.travis.yml +++ b/.travis.yml @@ -176,7 +176,12 @@ install: - test $SOLC_INSTALL_DEPS_TRAVIS != On || (scripts/install_deps.sh) - test "$TRAVIS_OS_NAME" != "linux" || (scripts/install_cmake.sh) - echo -n "$TRAVIS_COMMIT" > commit_hash.txt - - test $SOLC_DOCKER != On || (docker build -t ethereum/solc:build -f scripts/Dockerfile .) + - test $SOLC_DOCKER != On || ( + docker build -t ethereum/solc:build -f scripts/Dockerfile . + tmp_container=$(docker create brainbot-com/solidity-static sh) + mkdir -p upload + docker cp ${tmp_container}:/usr/local/bin/solc upload/ + ) before_script: - test $SOLC_EMSCRIPTEN != On || (scripts/build_emscripten.sh) @@ -223,11 +228,8 @@ deploy: overwrite: true file_glob: true - file: - - $TRAVIS_BUILD_DIR/solidity*.zip - - $TRAVIS_BUILD_DIR/solidity*tar.gz + file: $TRAVIS_BUILD_DIR/upload/* skip_cleanup: true on: all_branches: true tags: true - condition: $SOLC_RELEASE == On diff --git a/scripts/create_source_tarball.sh b/scripts/create_source_tarball.sh index 1f78e12c..bf8a336b 100755 --- a/scripts/create_source_tarball.sh +++ b/scripts/create_source_tarball.sh @@ -29,6 +29,7 @@ REPO_ROOT="$(dirname "$0")"/.. # Add dependencies mkdir -p "$SOLDIR/deps/downloads/" 2>/dev/null || true wget -O "$SOLDIR/deps/downloads/jsoncpp-1.7.7.tar.gz" https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz - tar czf "$REPO_ROOT/solidity_$versionstring.tar.gz" -C "$TEMPDIR" "solidity_$versionstring" + mkdir -p "$REPO_ROOT/upload" + tar czf "$REPO_ROOT/upload/solidity_$versionstring.tar.gz" -C "$TEMPDIR" "solidity_$versionstring" rm -r "$TEMPDIR" ) diff --git a/scripts/release.sh b/scripts/release.sh index e9f43f6c..a2f4d98a 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -88,5 +88,5 @@ if [[ "$OSTYPE" == "darwin"* ]]; then fi # And ZIP it all up, with a filename suffix passed in on the command-line. - -zip -j $REPO_ROOT/solidity-$ZIP_SUFFIX.zip $ZIP_TEMP_DIR/* +mkdir -p $REPO_ROOT/upload +zip -j $REPO_ROOT/upload/solidity-$ZIP_SUFFIX.zip $ZIP_TEMP_DIR/* diff --git a/scripts/travis-emscripten/build_emscripten.sh b/scripts/travis-emscripten/build_emscripten.sh index a6eb01a0..02740e6c 100755 --- a/scripts/travis-emscripten/build_emscripten.sh +++ b/scripts/travis-emscripten/build_emscripten.sh @@ -94,6 +94,8 @@ emmake make -j 4 cd .. cp build/solc/soljson.js ./ +mkdir -p upload +cp soljson.js upload/ OUTPUT_SIZE=`ls -la build/solc/soljson.js` -- cgit v1.2.3 From f9792a617187cc8aa6663fd831e319c94588df45 Mon Sep 17 00:00:00 2001 From: chriseth Date: Fri, 17 Mar 2017 10:34:07 +0100 Subject: Create temporary docker image. --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f0a66255..900321d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -177,10 +177,10 @@ install: - test "$TRAVIS_OS_NAME" != "linux" || (scripts/install_cmake.sh) - echo -n "$TRAVIS_COMMIT" > commit_hash.txt - test $SOLC_DOCKER != On || ( - docker build -t ethereum/solc:build -f scripts/Dockerfile . - tmp_container=$(docker create brainbot-com/solidity-static sh) + docker build -t tmp -f scripts/Dockerfile . + tmp_container=$(docker create tmp sh) mkdir -p upload - docker cp ${tmp_container}:/usr/local/bin/solc upload/ + docker cp ${tmp_container}:/usr/bin/solc upload/ ) before_script: -- cgit v1.2.3 From 252299a1db1b0a4a3a19bd0f514be50be3423a66 Mon Sep 17 00:00:00 2001 From: chriseth Date: Fri, 17 Mar 2017 12:32:49 +0100 Subject: Move docker build to its own script. --- .travis.yml | 7 +------ scripts/docker_build.sh | 8 ++++++++ 2 files changed, 9 insertions(+), 6 deletions(-) create mode 100755 scripts/docker_build.sh diff --git a/.travis.yml b/.travis.yml index 900321d1..61fe0cc3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -176,15 +176,10 @@ install: - test $SOLC_INSTALL_DEPS_TRAVIS != On || (scripts/install_deps.sh) - test "$TRAVIS_OS_NAME" != "linux" || (scripts/install_cmake.sh) - echo -n "$TRAVIS_COMMIT" > commit_hash.txt - - test $SOLC_DOCKER != On || ( - docker build -t tmp -f scripts/Dockerfile . - tmp_container=$(docker create tmp sh) - mkdir -p upload - docker cp ${tmp_container}:/usr/bin/solc upload/ - ) before_script: - 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 && scripts/release.sh $ZIP_SUFFIX && scripts/create_source_tarball.sh) diff --git a/scripts/docker_build.sh b/scripts/docker_build.sh new file mode 100755 index 00000000..3bf7c16f --- /dev/null +++ b/scripts/docker_build.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env sh + +set -e + +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/ -- cgit v1.2.3 From 73efdabd377f3118a17fe4cbac4f3156bdc3c2c8 Mon Sep 17 00:00:00 2001 From: chriseth Date: Mon, 20 Mar 2017 14:03:11 +0100 Subject: Rename solc binary. --- scripts/docker_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/docker_build.sh b/scripts/docker_build.sh index 3bf7c16f..22657a8c 100755 --- a/scripts/docker_build.sh +++ b/scripts/docker_build.sh @@ -5,4 +5,4 @@ set -e 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/ +docker cp ${tmp_container}:/usr/bin/solc upload/solc-static-linux -- cgit v1.2.3