Skip to content

Commit 0ad4f78

Browse files
authored
Upgraded to rules_bazel_integration_test 0.5.0. (#47)
1 parent aad2fa5 commit 0ad4f78

File tree

6 files changed

+21
-14
lines changed

6 files changed

+21
-14
lines changed

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:bazel_integration_test.bzl",
12+
"@cgrindel_rules_bazel_integration_test//bazel_integration_test:defs.bzl",
1313
"integration_test_utils",
1414
)
1515

WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ load("@cgrindel_rules_bazel_integration_test//bazel_integration_test:deps.bzl",
6060
bazel_integration_test_rules_dependencies()
6161

6262
load("//:bazel_versions.bzl", "SUPPORTED_BAZEL_VERSIONS")
63-
load("@build_bazel_integration_testing//tools:repositories.bzl", "bazel_binaries")
63+
load("@cgrindel_rules_bazel_integration_test//bazel_integration_test:defs.bzl", "bazel_binaries")
6464

6565
bazel_binaries(versions = SUPPORTED_BAZEL_VERSIONS)
6666

doc/BUILD.bazel

Lines changed: 1 addition & 1 deletion
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_bazel_doc//bazeldoc:bazeldoc.bzl",
3+
"@cgrindel_bazel_starlib//bazeldoc:defs.bzl",
44
"doc_for_provs",
55
"write_file_list",
66
"write_header",

examples/BUILD.bazel

Lines changed: 3 additions & 1 deletion
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:bazel_integration_test.bzl",
3+
"@cgrindel_rules_bazel_integration_test//bazel_integration_test:defs.bzl",
44
"bazel_integration_test",
55
"bazel_integration_tests",
66
"default_test_runner",
@@ -42,6 +42,7 @@ default_test_runner(
4242
test_runner = ":default_test_runner",
4343
workspace_files = integration_test_utils.glob_workspace_files(example) +
4444
ADDITIONAL_WORKSPACE_FILES,
45+
workspace_path = example,
4546
)
4647
for example in _EXAMPLE_NAMES
4748
]
@@ -75,6 +76,7 @@ bazel_integration_tests(
7576
test_runner = ":default_test_runner",
7677
workspace_files = integration_test_utils.glob_workspace_files("simple") +
7778
ADDITIONAL_WORKSPACE_FILES,
79+
workspace_path = "simple",
7880
)
7981

8082
# MARK: - Test Suites

examples/change_update_all_test.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ create_scratch_dir_sh="$(rlocation "${create_scratch_dir_sh_location}")" || \
2323

2424
# MARK - Process Flags
2525

26+
bazel="${BIT_BAZEL_BINARY:-}"
27+
workspace_dir="${BIT_WORKSPACE_DIR:-}"
28+
2629
# Process args
2730
while (("$#")); do
2831
case "${1}" in
@@ -40,10 +43,9 @@ while (("$#")); do
4043
esac
4144
done
4245

43-
[[ -n "${bazel:-}" ]] || exit_on_error "Must specify the location of the Bazel binary."
44-
[[ -n "${workspace_path:-}" ]] || exit_on_error "Must specify the location of the workspace file."
46+
[[ -n "${bazel:-}" ]] || fail "Must specify the location of the Bazel binary."
47+
[[ -n "${workspace_dir:-}" ]] || fail "Must specify the location of the workspace directory."
4548

46-
workspace_dir="$(dirname "${workspace_path}")"
4749

4850
# MARK - Create Scratch Directory
4951

swiftformat/deps.bzl

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@ def swiftformat_rules_dependencies():
1313
sha256 = "c6966ec828da198c5d9adbaa94c05e3a1c7f21bd012a0b29ba8ddbccb2c93b0d",
1414
)
1515

16-
http_archive(
16+
maybe(
17+
http_archive,
1718
name = "cgrindel_bazel_starlib",
18-
sha256 = "5b36e7f11bf0c1d52480f1b022430611b402b5424979f280f13c52550de76584",
19-
strip_prefix = "bazel-starlib-0.3.0",
19+
sha256 = "9e054e423bb7674e02052e52725b41288369dd94efff963479f76fe269b5177f",
20+
strip_prefix = "bazel-starlib-0.3.1",
2021
urls = [
21-
"http://github.com/cgrindel/bazel-starlib/archive/v0.3.0.tar.gz",
22+
"http://github.com/cgrindel/bazel-starlib/archive/v0.3.1.tar.gz",
2223
],
2324
)
2425

@@ -35,7 +36,9 @@ def swiftformat_rules_dependencies():
3536
maybe(
3637
http_archive,
3738
name = "cgrindel_rules_bazel_integration_test",
38-
sha256 = "50b808269ee09373c099256103c40629db8a66fd884030d7a36cf9a2e8675b75",
39-
strip_prefix = "rules_bazel_integration_test-0.3.1",
40-
urls = ["https://github.com/cgrindel/rules_bazel_integration_test/archive/v0.3.1.tar.gz"],
39+
sha256 = "39071d2ec8e3be74c8c4a6c395247182b987cdb78d3a3955b39e343ece624982",
40+
strip_prefix = "rules_bazel_integration_test-0.5.0",
41+
urls = [
42+
"http://github.com/cgrindel/rules_bazel_integration_test/archive/v0.5.0.tar.gz",
43+
],
4144
)

0 commit comments

Comments
 (0)