Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Minor change to allow docker builds. #621

Merged
merged 1 commit into from
Aug 29, 2018
Merged

Minor change to allow docker builds. #621

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions scripts/init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ set -e

echo "*** Initialising WASM build environment"

rustup update nightly
if [ -z $CI_PROJECT_NAME ] ; then
Copy link
Contributor

Choose a reason for hiding this comment

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

@ddorgan can you expand on how this works?

Copy link
Member Author

Choose a reason for hiding this comment

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

@pepyakin basically we just want to avoid running rustup while in a rust container as it will cause an os link error and bomb out.

So this just checks if it's running via gitlab and avoids running rustup in that case.

rustup update nightly
rustup update stable
fi

rustup target add wasm32-unknown-unknown --toolchain nightly
rustup update stable

# Install wasm-gc. It's useful for stripping slimming down wasm binaries.
command -v wasm-gc || \
Expand Down