Skip to content

Commit d91ed50

Browse files
feat: windows formatters (#605)
Update the toolchain to include windows builds of each formatter. These missing windows builds are preventing windows tests from running in rules_js Bump rules_multitool to 0.11.0 for windows support --------- Co-authored-by: Alex Eagle <[email protected]>
1 parent 05b5924 commit d91ed50

File tree

5 files changed

+51
-5
lines changed

5 files changed

+51
-5
lines changed

.github/workflows/mirror.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
cd docs
2020
bazel run update
2121
- name: Download and Extract Latest Multitool
22-
run: wget -O- https://github.com/theoremlp/multitool/releases/download/v0.4.0/multitool-x86_64-unknown-linux-gnu.tar.xz | tar --strip-components=1 -xJf -
22+
run: wget -O- https://github.com/theoremlp/multitool/releases/download/v0.11.0/multitool-x86_64-unknown-linux-gnu.tar.xz | tar --strip-components=1 -xJf -
2323
- name: Find Updates and Render Lockfile
2424
run: |
2525
./multitool --lockfile lint/multitool.lock.json update

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ bazel_dep(name = "bazel_features", version = "1.0.0")
1616
bazel_dep(name = "bazel_skylib", version = "1.4.2")
1717
bazel_dep(name = "platforms", version = "0.0.7")
1818
bazel_dep(name = "rules_multirun", version = "0.9.0")
19-
bazel_dep(name = "rules_multitool", version = "0.4.0")
19+
bazel_dep(name = "rules_multitool", version = "0.11.0")
2020
bazel_dep(name = "rules_diff", version = "1.0.0")
2121
bazel_dep(name = "rules_shell", version = "0.5.0")
2222

format/multitool.lock.json

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@
2929
"sha256": "0dda6600cf263b703a5ad93e792b06180c36afdee9638617a91dd552f2c6fb3e",
3030
"os": "macos",
3131
"cpu": "x86_64"
32+
},
33+
{
34+
"kind": "file",
35+
"url": "https://github.com/mvdan/gofumpt/releases/download/v0.8.0/gofumpt_v0.8.0_windows_amd64.exe",
36+
"sha256": "6d25310f322080af6de8193617d78495b356a5ede65fde6d5d0e4bcdfff1f2a4",
37+
"os": "windows",
38+
"cpu": "x86_64"
3239
}
3340
]
3441
},
@@ -65,6 +72,14 @@
6572
"sha256": "76901637f60589bb9bf91b3481d4aecbc31efcd35ca99ae72bcb510b00270ad9",
6673
"os": "macos",
6774
"cpu": "x86_64"
75+
},
76+
{
77+
"kind": "archive",
78+
"url": "https://github.com/google/go-jsonnet/releases/download/v0.20.0/go-jsonnet_0.20.0_Windows_x86_64.tar.gz",
79+
"file": "jsonnetfmt.exe",
80+
"sha256": "82440a646a8d29487a243afc880db245f612a205d3eccbb900bc76d7a4049ad1",
81+
"os": "windows",
82+
"cpu": "x86_64"
6883
}
6984
]
7085
},
@@ -97,6 +112,13 @@
97112
"sha256": "c31548693de6584e6164b7ed5fbb7b4a083f2d937ca94b4e0ddf59aa461a85e4",
98113
"os": "macos",
99114
"cpu": "x86_64"
115+
},
116+
{
117+
"kind": "file",
118+
"url": "https://github.com/mvdan/sh/releases/download/v3.12.0/shfmt_v3.12.0_windows_amd64.exe",
119+
"sha256": "c8bda517ba1c640ce4a715c0fa665439ddbe4357ba5e9b77b0e51e70e2b9c94b",
120+
"os": "windows",
121+
"cpu": "x86_64"
100122
}
101123
]
102124
},
@@ -133,6 +155,14 @@
133155
"sha256": "0eaf64e28f82e2defd06f7a6f3187d8cea03d5d9fcd2af54f549a6c32d6833f7",
134156
"os": "macos",
135157
"cpu": "x86_64"
158+
},
159+
{
160+
"kind": "archive",
161+
"url": "https://releases.hashicorp.com/terraform/1.7.5/terraform_1.7.5_windows_amd64.zip",
162+
"file": "terraform.exe",
163+
"sha256": "9b7be6ae159191ec1f4b5b9d27529ae5243e41020fb545c0041235bec8d92269",
164+
"os": "windows",
165+
"cpu": "x86_64"
136166
}
137167
]
138168
},
@@ -169,6 +199,14 @@
169199
"sha256": "e806fe1013e601788e762dc7e54858b0bb4bdc828c5b4c95125db67cd997ac30",
170200
"os": "macos",
171201
"cpu": "x86_64"
202+
},
203+
{
204+
"kind": "archive",
205+
"url": "https://github.com/google/yamlfmt/releases/download/v0.17.2/yamlfmt_0.17.2_Windows_x86_64.tar.gz",
206+
"file": "yamlfmt.exe",
207+
"sha256": "fc6fd9328f62d7880c1eda1889f9eba39f42c6317761c23c27771349ba601513",
208+
"os": "windows",
209+
"cpu": "x86_64"
172210
}
173211
]
174212
}

format/repositories.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ def rules_lint_dependencies():
2424

2525
http_archive(
2626
name = "rules_multitool",
27-
sha256 = "557b71b7d8d9975afc7fc2381c4c0e4220d43a581fb019217ca0a040d6cbebff",
28-
strip_prefix = "rules_multitool-0.6.0",
29-
url = "https://github.com/theoremlp/rules_multitool/releases/download/v0.6.0/rules_multitool-0.6.0.tar.gz",
27+
sha256 = "ac97f3ab2869d1490130e68280366d4559510266a5b215c628c5afd4bd245d4e",
28+
strip_prefix = "rules_multitool-0.11.0",
29+
url = "https://github.com/theoremlp/rules_multitool/releases/download/v0.11.0/rules_multitool-0.11.0.tar.gz",
3030
)
3131

3232
# Transitive of rules_multitool, included here for convenience

lint/multitool.lock.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@
3333
"sha256": "5c795cae1956a1d1c84e1d93c952b627da1541311fdbb09885bf9d80b0e2cc42",
3434
"os": "macos",
3535
"cpu": "x86_64"
36+
},
37+
{
38+
"kind": "archive",
39+
"url": "https://github.com/astral-sh/ruff/releases/download/0.12.8/ruff-x86_64-pc-windows-msvc.zip",
40+
"file": "ruff.exe",
41+
"sha256": "223d7691fc68bfcfb0bbefa35e5d63998721367404573d883e97583fe73a7682",
42+
"os": "windows",
43+
"cpu": "x86_64"
3644
}
3745
]
3846
},

0 commit comments

Comments
 (0)