cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1109 from ethereum/fixmultipublish

Browse Source 
Fix multiple binaries and publish from release branch
This commit is contained in:
chriseth 2016-10-04 12:00:40 +02:00 committed by GitHub
commit c63b2452e5
4 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -186,7 +186,9 @@ deploy:
script: test $TRAVIS_EMSCRIPTEN != On || scripts/release_emscripten.sh script: test $TRAVIS_EMSCRIPTEN != On || scripts/release_emscripten.sh
skip_cleanup: true skip_cleanup: true
on: on:
branch: develop branch:
- develop
- release
# This is the deploy target for the native build (Linux and macOS) # This is the deploy target for the native build (Linux and macOS)
# which generates ZIPs per commit. We are in agreement that # which generates ZIPs per commit. We are in agreement that

5
scripts/build_emscripten.sh
View File

@ -29,7 +29,12 @@
set -e set -e
if [[ "$OSTYPE" != "darwin"* ]]; then if [[ "$OSTYPE" != "darwin"* ]]; then
if [ "$TRAVIS_BRANCH" = release ]
then
echo -n > prerelease.txt
else
date -u +"nightly.%Y.%-m.%-d" > prerelease.txt date -u +"nightly.%Y.%-m.%-d" > prerelease.txt
fi
./scripts/travis-emscripten/install_deps.sh ./scripts/travis-emscripten/install_deps.sh
docker run -v $(pwd):/src trzeci/emscripten:sdk-tag-1.35.4-64bit ./scripts/travis-emscripten/build_emscripten.sh docker run -v $(pwd):/src trzeci/emscripten:sdk-tag-1.35.4-64bit ./scripts/travis-emscripten/build_emscripten.sh
fi fi

2
scripts/release_ppa.sh
View File

@ -59,7 +59,7 @@ commitdate=`git show --format=%ci HEAD | head -n 1 | cut - -b1-10 | sed -e 's/-0
echo "$commithash" > commit_hash.txt echo "$commithash" > commit_hash.txt
if [ $branch = develop ] if [ $branch = develop ]
then then
debversion="$version-nightly-$commitdate-$commithash" debversion="$version-develop-$commitdate-$commithash"
else else
debversion="$version" debversion="$version"
echo -n > prerelease.txt # proper release echo -n > prerelease.txt # proper release

28
scripts/travis-emscripten/publish_binary.sh
View File

@ -54,21 +54,37 @@ git config user.name "travis"
git config user.email "chris@ethereum.org" git config user.email "chris@ethereum.org"
git checkout -B gh-pages origin/gh-pages git checkout -B gh-pages origin/gh-pages
git clean -f -d -x 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 ]
# We only want one release per day and we do not want to push the same commit twice. # 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" if ls ./bin/soljson-"$VER-nightly.$DATE"*.js || ls ./bin/soljson-*"commit.$COMMIT.js"
then then
echo "Not publishing, we already published this version today." echo "Not publishing, we already published this version today."
exit 0 exit 0
fi fi
FULLVERSION="$VER-nightly.$DATE+commit.$COMMIT"
else
echo "Not publishing, wrong branch."
exit 0
fi
# This file is assumed to be the product of the build_emscripten.sh script. # This file is assumed to be the product of the build_emscripten.sh script.
cp ../soljson.js ./bin/"soljson-$VER-nightly.$DATE+commit.$COMMIT.js" cp ../soljson.js ./bin/"soljson-$FULLVERSION.js"
node ./update node ./update
cd bin cd bin
LATEST=$(ls -r soljson-v* | head -n 1)
cp "$LATEST" soljson-latest.js
cp soljson-latest.js ../soljson.js
git add . git add .
git add ../soljson.js git add ../soljson.js
git commit -m "Added compiler version $LATEST" git commit -m "Added compiler version $FULLVERSION"
git push origin gh-pages git push origin gh-pages