From 67fed3d76deae9eb62f0313812c56e93e595cb3a Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sun, 29 Oct 2023 13:24:10 +0300 Subject: chore(tools/depotfmt): use Go version from buildGo This is required because Go 1.18 is actually being deleted. I've applied the formatting breakage that it introduces (such as breaking comment formatting), because I can't be bothered to try and work around broken Go stuff. Change-Id: Ica7cee0d01228845d6a766079fef36df99a3da96 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9832 Autosubmit: tazjin Reviewed-by: flokli Tested-by: BuildkiteCI --- tools/depotfmt.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tools/depotfmt.nix') diff --git a/tools/depotfmt.nix b/tools/depotfmt.nix index 4530469d1cfe..f493a42e5956 100644 --- a/tools/depotfmt.nix +++ b/tools/depotfmt.nix @@ -9,10 +9,9 @@ let echo "$@" | xargs -n1 ${pkgs.terraform}/bin/terraform fmt ''; - # TODO: Upgrade to Go 1.19 and reformat tree config = pkgs.writeText "depot-treefmt-config" '' [formatter.go] - command = "${pkgs.go_1_18}/bin/gofmt" + command = "${depot.nix.buildGo.go}/bin/gofmt" options = [ "-w" ] includes = ["*.go"] -- cgit 1.4.1