File tree 2 files changed +8
-5
lines changed 2 files changed +8
-5
lines changed Original file line number Diff line number Diff line change 16
16
17
17
env :
18
18
# 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
22
22
23
23
before_install :
24
24
- |
Original file line number Diff line number Diff line change @@ -150,9 +150,11 @@ test_scala_library_expect_failure_on_missing_direct_deps_warn_mode() {
150
150
151
151
test_scala_library_expect_failure_on_missing_direct_java () {
152
152
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'
153
155
test_target=' //test_expect_failure/missing_direct_deps/internal_deps:transitive_dependency_java_user'
154
156
155
- expected_message=" $dependency_target [ \t]*to[ \t] *$test_target "
157
+ expected_message=" $dependency_file . *$test_target "
156
158
157
159
test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message " ${expected_message} " $test_target " --strict_java_deps=error"
158
160
}
@@ -169,9 +171,10 @@ test_scala_library_expect_better_failure_message_on_missing_transitive_dependenc
169
171
170
172
test_scala_library_expect_failure_on_missing_direct_deps_warn_mode_java () {
171
173
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'
172
175
test_target=' //test_expect_failure/missing_direct_deps/internal_deps:transitive_dependency_java_user'
173
176
174
- local expected_message=" buildozer 'add deps $dependency_target ' $test_target "
177
+ local expected_message=" $dependency_file .* $test_target "
175
178
176
179
test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message " ${expected_message} " ${test_target} " --strict_java_deps=warn" " ne"
177
180
}
You can’t perform that action at this time.
0 commit comments