aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2017-03-17 01:36:48 +0800
committerchriseth <chris@ethereum.org>2017-03-17 19:33:40 +0800
commit3f83bb80bfcf40b7a3c9ca9977eb3859c289e6e9 (patch)
tree61f878b49c15b14dce2e37bf43dc7891a58b519d
parent245c8914cf06b086fc7cd46e4158e9eda2b324ec (diff)
downloaddexon-solidity-3f83bb80bfcf40b7a3c9ca9977eb3859c289e6e9.tar.gz
dexon-solidity-3f83bb80bfcf40b7a3c9ca9977eb3859c289e6e9.tar.zst
dexon-solidity-3f83bb80bfcf40b7a3c9ca9977eb3859c289e6e9.zip
Publish soljson and alpine static build on github release page.
-rw-r--r--.travis.yml12
-rwxr-xr-xscripts/create_source_tarball.sh3
-rwxr-xr-xscripts/release.sh4
-rwxr-xr-xscripts/travis-emscripten/build_emscripten.sh2
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`