Skip to content

Commit 5095971

Browse files
authored
Upgrade bazel travis to 0.12.0 (#505)
1 parent aeb1da1 commit 5095971

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ os:
1616

1717
env:
1818
# we want to test the last release
19-
- V=0.11.1 TEST_SCRIPT=test_rules_scala.sh
20-
- V=0.11.1 TEST_SCRIPT=test_intellij_aspect.sh
21-
- V=0.11.1 TEST_SCRIPT=test_reproducibility.sh
19+
- V=0.12.0 TEST_SCRIPT=test_rules_scala.sh
20+
- V=0.12.0 TEST_SCRIPT=test_intellij_aspect.sh
21+
- V=0.12.0 TEST_SCRIPT=test_reproducibility.sh
2222

2323
before_install:
2424
- |

test_rules_scala.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,11 @@ test_scala_library_expect_failure_on_missing_direct_deps_warn_mode() {
150150

151151
test_scala_library_expect_failure_on_missing_direct_java() {
152152
dependency_target='//test_expect_failure/missing_direct_deps/internal_deps:transitive_dependency'
153+
#since bazel 0.12.0 the labels are only emmitted if ijar is in play
154+
dependency_file='test_expect_failure/missing_direct_deps/internal_deps/transitive_dependency_ijar.jar'
153155
test_target='//test_expect_failure/missing_direct_deps/internal_deps:transitive_dependency_java_user'
154156

155-
expected_message="$dependency_target[ \t]*to[ \t]*$test_target"
157+
expected_message="$dependency_file.*$test_target"
156158

157159
test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message "${expected_message}" $test_target "--strict_java_deps=error"
158160
}
@@ -169,9 +171,10 @@ test_scala_library_expect_better_failure_message_on_missing_transitive_dependenc
169171

170172
test_scala_library_expect_failure_on_missing_direct_deps_warn_mode_java() {
171173
dependency_target='//test_expect_failure/missing_direct_deps/internal_deps:transitive_dependency'
174+
dependency_file='test_expect_failure/missing_direct_deps/internal_deps/transitive_dependency_ijar.jar'
172175
test_target='//test_expect_failure/missing_direct_deps/internal_deps:transitive_dependency_java_user'
173176

174-
local expected_message="buildozer 'add deps $dependency_target ' $test_target"
177+
local expected_message="$dependency_file.*$test_target"
175178

176179
test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message "${expected_message}" ${test_target} "--strict_java_deps=warn" "ne"
177180
}

0 commit comments

Comments
 (0)