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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pepyakin
reviewed
Aug 28, 2018
| @@ -4,9 +4,12 @@ set -e | |||
|
|
|||
| echo "*** Initialising WASM build environment" | |||
|
|
|||
| rustup update nightly | |||
| if [ -z $CI_PROJECT_NAME ] ; then | |||
There was a problem hiding this comment.
@ddorgan can you expand on how this works?
There was a problem hiding this comment.
@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.
gavofyork
added
A8-looksgood
and removed
A0-please_review
gavofyork
approved these changes
Aug 29, 2018
gguoss
pushed a commit
to chainx-org/substrate
that referenced
this pull request
Sep 3, 2018
dvdplm
added a commit
that referenced
this pull request
Sep 3, 2018
…rs-generic-over-hasher-and-rlpcodec * origin/master: (26 commits) Contract runtime polishing (#601) WIP on chain heap (#639) Events to track extrinsic success (#640) Install llvm-tools-preview component (#643) fix wasm executor compile error (#631) random fixes (#638) Empty becomes (), reflecting convention (#637) Allow to build_upon skipped entries, but don't walk back (#635) Separate out staking module into balances and payment (#629) Update .gitlab-ci.yml (#633) Do not attempt to rustup if in CI. This is taken care of by the base (#621) Avoid need for ident strings in storage (#624) rename to panic_handler as panic_implementation is deprecated in nightly (#626) 5 random fixes (#2) (#623) fix one typo in README (#627) Misspelled words (#625) Contracts: Per block gas limit (#506) Make sure to ban invalid transactions. (#615) (#620) Forward-port BFT fixes from v0.2 and restructure agreement cancelling (#619) Allow specifying listening multiaddresses (#577) ...
dvdplm
pushed a commit
that referenced
this pull request
Sep 4, 2018
gavofyork
pushed a commit
that referenced
this pull request
Sep 4, 2018
* Use parity-ethereum rev 02c54d42398f to fix build * More lockfiles and new build artifacts * Update .gitlab-ci.yml (#633) it is necessary to test. You will probably have to create a cron-job for the nightly assembly of the master branch * Do not attempt to rustup if in CI. This is taken care of by the base (#621) image. * Improve docker image size with a 2 stages image (#463) * Improve docker image size with a 2 stages image * Minor doc updates * Fix and reduce size of the docker image * Fix paths in scripts * cargo --force to allow CI to build. (#599)
dvdplm
added a commit
that referenced
this pull request
Sep 4, 2018
* master: (22 commits) Introduce treasury and document (#646) Off-the-table staking preference (#656) Implement function `json_metadata` in `decl_module!` (#654) Fix warnings in networking (#652) Add a reputation system (#645) Check for pruned block state (#648) Contract runtime polishing (#601) WIP on chain heap (#639) Events to track extrinsic success (#640) Install llvm-tools-preview component (#643) fix wasm executor compile error (#631) random fixes (#638) Empty becomes (), reflecting convention (#637) Allow to build_upon skipped entries, but don't walk back (#635) Separate out staking module into balances and payment (#629) Update .gitlab-ci.yml (#633) Do not attempt to rustup if in CI. This is taken care of by the base (#621) Avoid need for ident strings in storage (#624) rename to panic_handler as panic_implementation is deprecated in nightly (#626) 5 random fixes (#2) (#623) ...
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Do not attempt to rustup if in CI. This is taken care of by the base image and will cause a crosslink error.