From 7f9a1dfa9c0f9f1bf2042a28b02f45523345d56c Mon Sep 17 00:00:00 2001 From: Yves-Stan Le Cornec Date: Mon, 19 Jun 2023 14:59:51 +0200 Subject: [PATCH 1/2] Fix buildifier --- BUILD.bazel | 2 ++ buildifier/BUILD.bazel | 5 ----- rules_haskell_tests/WORKSPACE | 1 - rules_haskell_tests/buildifier/BUILD.bazel | 3 --- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index 393911424..17d34a89c 100755 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -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__"], ) diff --git a/buildifier/BUILD.bazel b/buildifier/BUILD.bazel index 2087b65c1..8c1a94310 100644 --- a/buildifier/BUILD.bazel +++ b/buildifier/BUILD.bazel @@ -9,7 +9,6 @@ buildifier( name = "buildifier", exclude_patterns = buildifier_exclude_patterns, mode = "check", - tags = ["manual"], ) # Run this to fix the errors in BUILD files. @@ -17,7 +16,6 @@ buildifier( name = "buildifier-fix", exclude_patterns = buildifier_exclude_patterns, mode = "fix", - tags = ["manual"], verbose = True, ) @@ -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", @@ -46,7 +42,6 @@ buildifier_test( mode = "diff", tags = [ "dont_test_on_windows", - "manual", ], ) diff --git a/rules_haskell_tests/WORKSPACE b/rules_haskell_tests/WORKSPACE index 2e02174fd..2901d2718 100644 --- a/rules_haskell_tests/WORKSPACE +++ b/rules_haskell_tests/WORKSPACE @@ -190,4 +190,3 @@ bind( name = "python_headers", actual = "@com_google_protobuf//util/python:python_headers", ) - diff --git a/rules_haskell_tests/buildifier/BUILD.bazel b/rules_haskell_tests/buildifier/BUILD.bazel index e1c880375..0af9a538b 100644 --- a/rules_haskell_tests/buildifier/BUILD.bazel +++ b/rules_haskell_tests/buildifier/BUILD.bazel @@ -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, ) @@ -29,7 +27,6 @@ buildifier_test( mode = "diff", tags = [ "dont_test_on_windows", - "manual", ], ) From 445850b55388b89b07d9ae6673b86ecc32e8d380 Mon Sep 17 00:00:00 2001 From: Yves-Stan Le Cornec Date: Mon, 19 Jun 2023 14:42:42 +0200 Subject: [PATCH 2/2] Update install-nix-action --- .github/workflows/workflow.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index a5f57eceb..95121f066 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -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: | @@ -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: |