Skip to content

Commit

Permalink
Merge pull request #1908 from tweag/ylecornec/buildifier_fix
Browse files Browse the repository at this point in the history
Buildifier fix
  • Loading branch information
mergify[bot] committed Jun 20, 2023
2 parents 4323e56 + 445850b commit 6a0686f
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
with:
path: ~/repo-cache
key: repo-cache-${{ runner.os }}-nixpkgs-${{ env.cache-version }}
- uses: cachix/install-nix-action@v21
- uses: cachix/install-nix-action@v22
with:
nix_path: nixpkgs=./nixpkgs/default.nix
extra_nix_config: |
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
with:
path: ~/repo-cache
key: repo-cache-${{ runner.os }}-nixpkgs-${{ env.cache-version }}
- uses: cachix/install-nix-action@v21
- uses: cachix/install-nix-action@v22
with:
nix_path: nixpkgs=./nixpkgs/default.nix
extra_nix_config: |
Expand Down
2 changes: 2 additions & 0 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ exports_files(
"BUILD.bazel",
"WORKSPACE",
"constants.bzl",
"non_module_dev_deps.bzl",
"non_module_dev_deps_2.bzl",
],
visibility = ["//buildifier:__pkg__"],
)
Expand Down
5 changes: 0 additions & 5 deletions buildifier/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,13 @@ buildifier(
name = "buildifier",
exclude_patterns = buildifier_exclude_patterns,
mode = "check",
tags = ["manual"],
)

# Run this to fix the errors in BUILD files.
buildifier(
name = "buildifier-fix",
exclude_patterns = buildifier_exclude_patterns,
mode = "fix",
tags = ["manual"],
verbose = True,
)

Expand All @@ -27,13 +25,11 @@ buildifier_test(
"//:BUILD.bazel",
"//:WORKSPACE",
"//:constants.bzl",
"//:non_module_deps.bzl",
"//:non_module_dev_deps.bzl",
"//:non_module_dev_deps_2.bzl",
"//buildifier:all_files",
"//debug/linking_utils:all_files",
"//docs:all_files",
"//extensions:all_files",
"//haskell:all_files",
"//nixpkgs:all_files",
"//rule_info:all_files",
Expand All @@ -46,7 +42,6 @@ buildifier_test(
mode = "diff",
tags = [
"dont_test_on_windows",
"manual",
],
)

Expand Down
1 change: 0 additions & 1 deletion rules_haskell_tests/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -190,4 +190,3 @@ bind(
name = "python_headers",
actual = "@com_google_protobuf//util/python:python_headers",
)

3 changes: 0 additions & 3 deletions rules_haskell_tests/buildifier/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@ load("@com_github_bazelbuild_buildtools//buildifier:def.bzl", "buildifier", "bui
buildifier(
name = "buildifier",
mode = "check",
tags = ["manual"],
)

# Run this to fix the errors in BUILD files.
buildifier(
name = "buildifier-fix",
mode = "fix",
tags = ["manual"],
verbose = True,
)

Expand All @@ -29,7 +27,6 @@ buildifier_test(
mode = "diff",
tags = [
"dont_test_on_windows",
"manual",
],
)

Expand Down

0 comments on commit 6a0686f

Please sign in to comment.