Skip to content

Commit 631e40a

Browse files
committed
Bazel tweaks
1 parent ff44e79 commit 631e40a

File tree

8 files changed

+31
-28
lines changed

8 files changed

+31
-28
lines changed

.mise/tasks/gen-bazel-rules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
set -euo pipefail
44

5-
ruby .mise/tasks/gen_bazel_rules.rb
5+
ruby .mise/tasks/scripts/gen_bazel_rules.rb

.mise/tasks/lint

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ set -euo pipefail
44

55
cd $MISE_PROJECT_ROOT
66

7-
bazel run //bazel/internal:buildifier.fix
7+
bazel run //bazel/dev:buildifier.fix
88
swiftformat .
99
swiftlint lint --quiet

.mise/tasks/lint-ci

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ set -euo pipefail
44

55
cd $MISE_PROJECT_ROOT
66

7-
bazel run //bazel/internal:buildifier.check
7+
bazel run //bazel/dev:buildifier.check
88
swiftformat --quiet --strict .
99
swiftlint lint --quiet --strict
File renamed without changes.

MODULE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ bazel_dep(name = "rules_apple", version = "3.16.0")
1010
bazel_dep(name = "bazel_skylib", version = "1.7.1")
1111
bazel_dep(name = "apple_support", version = "1.17.1")
1212

13-
# Bazel dev dependencies
14-
bazel_dep(name = "buildifier_prebuilt", version = "7.3.1", dev_dependency = True)
15-
1613
# Swift dependencies
1714
bazel_dep(name = "aexml", version = "4.7.0")
1815
bazel_dep(name = "swift_argument_parser", version = "1.5.0")
@@ -27,3 +24,6 @@ bazel_dep(name = "yams", version = "5.1.3")
2724
# Extensions
2825
generated = use_extension("//bazel:extensions.bzl", "generated")
2926
use_repo(generated, "periphery_generated")
27+
28+
# Bazel dev dependencies
29+
bazel_dep(name = "buildifier_prebuilt", version = "7.3.1", dev_dependency = True)

bazel/dev/BUILD.bazel

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
load("@buildifier_prebuilt//:rules.bzl", "buildifier")
2+
3+
buildifier(
4+
name = "buildifier.fix",
5+
exclude_patterns = [
6+
"./.git/**/*",
7+
"**/.build/**/*",
8+
],
9+
lint_mode = "fix",
10+
mode = "fix",
11+
)
12+
13+
buildifier(
14+
name = "buildifier.check",
15+
exclude_patterns = [
16+
"./.git/**/*",
17+
"**/.build/**/*",
18+
],
19+
lint_mode = "warn",
20+
mode = "check",
21+
)

bazel/internal/BUILD.bazel

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,3 @@
1-
load("@buildifier_prebuilt//:rules.bzl", "buildifier")
2-
31
exports_files([
42
"run.sh",
53
])
6-
7-
buildifier(
8-
name = "buildifier.fix",
9-
exclude_patterns = [
10-
"./.git/**/*",
11-
"**/.build/**/*",
12-
],
13-
lint_mode = "fix",
14-
mode = "fix",
15-
)
16-
17-
buildifier(
18-
name = "buildifier.check",
19-
exclude_patterns = [
20-
"./.git/**/*",
21-
"**/.build/**/*",
22-
],
23-
lint_mode = "warn",
24-
mode = "check",
25-
)

scripts/release

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@ fi
5353

5454
cp LICENSE.md MODULE.bazel BUILD.bazel .release/
5555
cp -R bazel Sources .release/
56+
rm -r .release/bazel/dev
5657
cp scripts/release_notes.md.template .release/release_notes.md
58+
cat .release/MODULE.bazel | sed s/version = "0.0.0"/version = "${version}"/ > .release/MODULE.bazel
59+
60+
confirm "\nContinue?"
5761

5862
# Codesign
5963
cd .release

0 commit comments

Comments
 (0)