Skip to content

Commit b161176

Browse files
authored
Upgrade rules_bazel_integration_test to use bazel-contrib release. (#55)
1 parent 0e2b09c commit b161176

File tree

7 files changed

+19
-18
lines changed

7 files changed

+19
-18
lines changed

.bazelignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Do not add the examples directories here. Execute
2-
# `bazel run @cgrindel_rules_bazel_integration_test//tools:update_deleted_packages`
2+
# `bazel run @contrib_rules_bazel_integration_test//tools:update_deleted_packages`
33
# to update the deleted packages in the .bazelrc.

.bazelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Trick bazel into treating BUILD files under examples/* as being regular files
33
# This lets us glob() up all the files inside the examples to make them inputs to tests
44
# (Note, we cannot use `common --deleted_packages` because the bazel version command doesn't support it)
5-
# To update these lines, run `bazel run @cgrindel_rules_bazel_integration_test//tools:update_deleted_packages`.
5+
# To update these lines, run `bazel run @contrib_rules_bazel_integration_test//tools:update_deleted_packages`.
66
build --deleted_packages=examples/exclude_files,examples/exclude_files/Sources/App,examples/exclude_files/Sources/Foo,examples/exclude_files/Tests/AppTests,examples/exclude_files/Tests/FooTests,examples/rules_swift_helpers,examples/rules_swift_helpers/Sources/App,examples/rules_swift_helpers/Sources/Foo,examples/rules_swift_helpers/Tests/AppTests,examples/rules_swift_helpers/Tests/FooTests,examples/simple,examples/simple/Foo
77
query --deleted_packages=examples/exclude_files,examples/exclude_files/Sources/App,examples/exclude_files/Sources/Foo,examples/exclude_files/Tests/AppTests,examples/exclude_files/Tests/FooTests,examples/rules_swift_helpers,examples/rules_swift_helpers/Sources/App,examples/rules_swift_helpers/Sources/Foo,examples/rules_swift_helpers/Tests/AppTests,examples/rules_swift_helpers/Tests/FooTests,examples/simple,examples/simple/Foo
88

BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ load(
99
"updatesrc_update_all",
1010
)
1111
load(
12-
"@cgrindel_rules_bazel_integration_test//bazel_integration_test:defs.bzl",
12+
"@contrib_rules_bazel_integration_test//bazel_integration_test:defs.bzl",
1313
"integration_test_utils",
1414
)
1515

WORKSPACE

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,22 @@ buildifier_prebuilt_register_toolchains()
4949

5050
# MARK: - Integration Testing
5151

52-
load("@cgrindel_rules_bazel_integration_test//bazel_integration_test:deps.bzl", "bazel_integration_test_rules_dependencies")
52+
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
53+
54+
http_archive(
55+
name = "contrib_rules_bazel_integration_test",
56+
sha256 = "ab9bbf776b5874f8a02f639fec2fbb3e3eefa4403cf861ae00d7c7e4d757f9ff",
57+
strip_prefix = "rules_bazel_integration_test-0.6.2",
58+
urls = [
59+
"http://github.com/bazel-contrib/rules_bazel_integration_test/archive/v0.6.2.tar.gz",
60+
],
61+
)
62+
63+
load("@contrib_rules_bazel_integration_test//bazel_integration_test:deps.bzl", "bazel_integration_test_rules_dependencies")
5364

5465
bazel_integration_test_rules_dependencies()
5566

56-
load("@cgrindel_rules_bazel_integration_test//bazel_integration_test:defs.bzl", "bazel_binaries")
67+
load("@contrib_rules_bazel_integration_test//bazel_integration_test:defs.bzl", "bazel_binaries")
5768
load("//:bazel_versions.bzl", "SUPPORTED_BAZEL_VERSIONS")
5869

5970
bazel_binaries(versions = SUPPORTED_BAZEL_VERSIONS)

examples/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
load("@cgrindel_bazel_starlib//bzlformat:defs.bzl", "bzlformat_pkg")
22
load(
3-
"@cgrindel_rules_bazel_integration_test//bazel_integration_test:defs.bzl",
3+
"@contrib_rules_bazel_integration_test//bazel_integration_test:defs.bzl",
44
"bazel_integration_test",
55
"bazel_integration_tests",
66
"default_test_runner",
@@ -52,7 +52,7 @@ sh_binary(
5252
testonly = True,
5353
srcs = ["change_update_all_test.sh"],
5454
data = [
55-
"@cgrindel_rules_bazel_integration_test//tools:create_scratch_dir",
55+
"@contrib_rules_bazel_integration_test//tools:create_scratch_dir",
5656
],
5757
deps = [
5858
"@bazel_tools//tools/bash/runfiles",

examples/change_update_all_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ assertions_sh="$(rlocation "${assertions_sh_location}")" || \
1616
(echo >&2 "Failed to locate ${assertions_sh_location}" && exit 1)
1717
source "${assertions_sh}"
1818

19-
create_scratch_dir_sh_location=cgrindel_rules_bazel_integration_test/tools/create_scratch_dir.sh
19+
create_scratch_dir_sh_location=contrib_rules_bazel_integration_test/tools/create_scratch_dir.sh
2020
create_scratch_dir_sh="$(rlocation "${create_scratch_dir_sh_location}")" || \
2121
(echo >&2 "Failed to locate ${create_scratch_dir_sh_location}" && exit 1)
2222

swiftformat/deps.bzl

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,3 @@ def swiftformat_rules_dependencies():
3434
"http://github.com/cgrindel/rules_spm/archive/v0.7.0.tar.gz",
3535
],
3636
)
37-
38-
maybe(
39-
http_archive,
40-
name = "cgrindel_rules_bazel_integration_test",
41-
sha256 = "39071d2ec8e3be74c8c4a6c395247182b987cdb78d3a3955b39e343ece624982",
42-
strip_prefix = "rules_bazel_integration_test-0.5.0",
43-
urls = [
44-
"http://github.com/cgrindel/rules_bazel_integration_test/archive/v0.5.0.tar.gz",
45-
],
46-
)

0 commit comments

Comments
 (0)