Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Broken smoke-test.sh #82

Merged
merged 3 commits into from Jan 10, 2019
Merged

Fix Broken smoke-test.sh #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95b0968
Run blaze build commands independently so that 'set -e' properly fails
acmcarther Jan 9, 2019
f028a4a
Merge branch 'master' into acm-fix-ci
acmcarther Jan 9, 2019
2b6f6b3
Fix spooky breakages
acmcarther Jan 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 9 additions & 3 deletions smoke-test.sh
View file
Open in desktop
Expand Up @@ -23,13 +23,18 @@ command_exists "bazel"
rm -rf "$EXAMPLES_DIR/remote" "$EXAMPLES_DIR/vendored"
cp -r "$TEST_DIR/remote" "$TEST_DIR/vendored" "$EXAMPLES_DIR"

# Set up root BUILD file
touch "$EXAMPLES_DIR/BUILD"

# Set up the new WORKSPACE file
cat > "$EXAMPLES_DIR/WORKSPACE" << EOF
workspace(name = "io_bazel_rules_rust")
workspace(name = "examples")

load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")

git_repository(
name = "io_bazel_rules_rust",
commit = "f32695dcd02d9a19e42b9eb7f29a24a8ceb2b858",
commit = "5894d35bb7b5f982478dfbf71bc411426fae3451",
remote = "https://github.com/bazelbuild/rules_rust.git",
)

Expand Down Expand Up @@ -83,7 +88,8 @@ for ex in $(find $EXAMPLES_DIR -mindepth 2 -maxdepth 2 -type d); do
bazel_cargo_path="//$ex_type/$ex_name/cargo:all"

echo "Running Bazel build for $bazel_path, $bazel_cargo_path"
bazel build "$bazel_path" && bazel build "$bazel_cargo_path"
bazel build "$bazel_path"
bazel build "$bazel_cargo_path"
done

cd "$PWD"
2 changes: 1 addition & 1 deletion smoke_test/vendored/non_cratesio_library/cargo/Cargo.toml
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ authors = ["Bradlee Speice <bradlee.speice@gmail.com>"]

[dependencies]

futures = { git = "https://github.com/rust-lang-nursery/futures-rs.git", tag = "0.1.19" }
futures = { git = "https://github.com/rust-lang-nursery/futures-rs.git", tag = "0.2.0" }
env_logger = { git = "https://github.com/sebasmagri/env_logger.git", tag = "v0.5.5" }
# Note that we use a (slightly) outdated version of log; because env_logger resolves a version
# of `log` from crates.io that may clash with the resolution here, we need to force
Expand Down