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

Replace misplaced & with && in gitlab-ci.yml #3753

Merged
merged 4 commits into from
Dec 9, 2016
Merged

Conversation

jacogr
Copy link
Contributor

@jacogr jacogr commented Dec 9, 2016

e.g. rust-test is running JS things here - https://gitlab.ethcore.io/Mirrors/ethcore-parity/builds/30044

@jacogr jacogr added A0-pleasereview 🤓 Pull request needs code review. M1-ci 🙉 Continuous integration. labels Dec 9, 2016
@rphmeier rphmeier added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Dec 9, 2016
@@ -422,13 +422,14 @@ test-rust-stable:
image: ethcore/rust:stable
before_script:
- git submodule update --init --recursive
- export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep \.rs | wc -l)
Copy link
Collaborator

@arkpar arkpar Dec 9, 2016

Choose a reason for hiding this comment

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

There a few other extensions that need to trigger rust tests. e.g. .json, .toml.
Better just check if any of the non-js files have been modified with something like grep -v \.js instead of grep -j \.rs

@gavofyork
Copy link
Contributor

is it really true that any file which does not end in .js is definitively a dependency of the rust portion? e.g. are there really no files under the js/ subtree which are not .js?

@gavofyork gavofyork added A0-pleasereview 🤓 Pull request needs code review. and removed A8-looksgood 🦄 Pull request is reviewed well. labels Dec 9, 2016
@arkpar arkpar added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Dec 9, 2016
@gavofyork gavofyork merged commit 2e1e167 into master Dec 9, 2016
@gavofyork gavofyork deleted the jg-fix-gitlab.yml branch December 9, 2016 19:16
@coveralls
Copy link

Coverage Status

Coverage increased (+0.01%) to 85.894% when pulling cf0b1bb on jg-fix-gitlab.yml into 2d6656f on master.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A8-looksgood 🦄 Pull request is reviewed well. M1-ci 🙉 Continuous integration.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants