Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions scripts/travis-emscripten/build_emscripten.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,18 @@ fi

WORKSPACE=/root/project

echo -en 'travis_fold:start:compiling_solidity\\r'
cd $WORKSPACE

# shellcheck disable=SC2166
if [[ "$CIRCLE_BRANCH" = release || -n "$CIRCLE_TAG" || -n "$FORCE_RELEASE" || "$(git tag --points-at HEAD 2>/dev/null)" == v* ]]

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The other scripts don't seem to have the git part. Why add here and not there?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I took that from a third script, and I think it is a good idea so that it also works locally.

then
echo -n >prerelease.txt
fi
if [ -n "$CIRCLE_SHA1" ]
then
echo -n "$CIRCLE_SHA1" >commit_hash.txt
fi

mkdir -p $BUILD_DIR
cd $BUILD_DIR
cmake \
Expand All @@ -67,5 +77,3 @@ cp $BUILD_DIR/libsolc/soljson.js ./
OUTPUT_SIZE=`ls -la soljson.js`

echo "Emscripten output size: $OUTPUT_SIZE"

echo -en 'travis_fold:end:compiling_solidity\\r'