Skip to content

Commit f7a2411

Browse files
roman-kashitsynlevsha
authored andcommitted
chore: commit tla2tools jar to the repo
1 parent bb68d0b commit f7a2411

File tree

8 files changed

+23
-14
lines changed

8 files changed

+23
-14
lines changed

.gitlab/CODEOWNERS

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
# [Bazel]
1616
/bazel/ @dfinity-lab/teams/idx
17-
/tlaplus/ @dfinity-lab/teams/idx
1817
/third_party/ @dfinity-lab/teams/idx
1918
/toolchains/ @dfinity-lab/teams/idx
2019
/WORKSPACE.bazel @dfinity-lab/teams/idx

WORKSPACE.bazel

-6
Original file line numberDiff line numberDiff line change
@@ -330,12 +330,6 @@ load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies")
330330
aspect_bazel_lib_dependencies()
331331

332332
# TLA+ tools
333-
http_jar(
334-
name = "tlaplus",
335-
sha256 = "6bd4b937968f7f80ea61891e79d171d3cccdf1f4e409fb841986656976ab9d32",
336-
url = "https://github.com/tlaplus/tlaplus/releases/download/v1.8.0/tla2tools.jar",
337-
)
338-
339333
http_jar(
340334
name = "tlaplus_community_modules",
341335
sha256 = "109e0828d192c33703d5cbc50b5b6e128acd816565616e27b3855949c7baba9c",

tlaplus/BUILD.bazel renamed to bazel/tlaplus/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# description of the TLA+ command-line tools.
33

44
COMMON_DEPS = [
5-
"@tlaplus//jar",
5+
"//third_party/tlaplus-1.8.0:tla2tools",
66
"@tlaplus_community_modules//jar",
77
"@tlaplus_community_modules_deps//jar",
88
]

tlaplus/defs.bzl renamed to bazel/tlaplus/defs.bzl

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ tla_module = rule(
4040
Declares a single TLA+ module.
4141
4242
```python
43-
load("//tlaplus:defs.bzl", "tla_module")
43+
load("//bazel/tlaplus:defs.bzl", "tla_module")
4444
4545
tla_module(
4646
name = "spec",
@@ -81,14 +81,14 @@ tlc_test = rule(
8181
attrs = {
8282
"spec": attr.label(providers = [TlaModuleInfo]),
8383
"config": attr.label(allow_single_file = [".cfg"]),
84-
"_tlc": attr.label(default = "//tlaplus:tlc", executable = True, cfg = "exec"),
84+
"_tlc": attr.label(default = "//bazel/tlaplus:tlc", executable = True, cfg = "exec"),
8585
},
8686
test = True,
8787
doc = """\
8888
Defines a test that runs TLC on a specification.
8989
9090
```python
91-
load("//tlaplus:defs.bzl", "tla_module", "tlc_test")
91+
load("//bazel/tlaplus:defs.bzl", "tla_module", "tlc_test")
9292
9393
tla_module(
9494
name = "spec",
@@ -133,7 +133,7 @@ sany_test = rule(
133133
attrs = {
134134
"module": attr.label(providers = [TlaModuleInfo]),
135135
"_sany": attr.label(
136-
default = Label("//tlaplus:sany"),
136+
default = Label("//bazel/tlaplus:sany"),
137137
executable = True,
138138
cfg = "exec",
139139
),

rs/bitcoin/ckbtc/spec/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//tlaplus:defs.bzl", "sany_test", "tla_module", "tlc_test")
1+
load("//bazel/tlaplus:defs.bzl", "sany_test", "tla_module", "tlc_test")
22

33
tla_module(
44
name = "tla_hash",

rs/state_manager/spec/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//tlaplus:defs.bzl", "sany_test", "tla_module", "tlc_test")
1+
load("//bazel/tlaplus:defs.bzl", "sany_test", "tla_module", "tlc_test")
22

33
tla_module(
44
name = "spec",

third_party/tlaplus-1.8.0/BUILD.bazel

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
"""
2+
This package provides a stable version of the TLA+ tools.
3+
Visit https://github.com/tlaplus/tlaplus/releases if you need to update the jar file.
4+
"""
5+
6+
package(default_visibility = ["//visibility:public"])
7+
8+
# NOTE: we committed the jar to the repo because version 1.8.0 is
9+
# in pre-release stage so its artifact hash keeps changing.
10+
# We should switch to the official 1.8.0 release once it's available.
11+
java_import(
12+
name = "tla2tools",
13+
jars = [
14+
":tla2tools.jar",
15+
],
16+
)
3.27 MB
Binary file not shown.

0 commit comments

Comments
 (0)