From 35f72f6fbe42115202a43be61a07805b3854b0d2 Mon Sep 17 00:00:00 2001
From: Ed Slocomb <edslocomb@gmail.com>
Date: Fri, 6 Oct 2023 21:47:52 -0700
Subject: [PATCH] use up-to-date golang (#218)

While running a full `make fmt-build`, I got some failures with
installer scripts for golang formatters. This fixes the problem by
installing an up-to-date golang instead of the version available in
ubuntu 20.04.

The ppa used here, `longsleep/golang-backports` is
[recommended](https://github.com/golang/go/wiki/Ubuntu) by the Go
project.

---------

Co-authored-by: Radon Rosborough <radon@intuitiveexplanations.com>
---
 test/formatters/install-common.bash       | 4 +++-
 test/formatters/installers/gofumpt.bash   | 9 +++------
 test/formatters/installers/goimports.bash | 4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/test/formatters/install-common.bash b/test/formatters/install-common.bash
index c073ffc..113e7ac 100755
--- a/test/formatters/install-common.bash
+++ b/test/formatters/install-common.bash
@@ -4,7 +4,7 @@ set -euxo pipefail
 
 export DEBIAN_FRONTEND=noninteractive
 apt-get update
-apt-get install -y ca-certificates curl gnupg lsb-release
+apt-get install -y ca-certificates curl gnupg lsb-release software-properties-common
 
 curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
 
@@ -15,6 +15,8 @@ tee -a /etc/apt/sources.list.d/nodejs.list >/dev/null <<EOF
 deb [arch=amd64] https://deb.nodesource.com/${node_repo} ${ubuntu_name} main
 EOF
 
+add-apt-repository -n ppa:longsleep/golang-backports
+
 apt-get update
 
 packages="
diff --git a/test/formatters/installers/gofumpt.bash b/test/formatters/installers/gofumpt.bash
index b16ef37..ee58e5d 100644
--- a/test/formatters/installers/gofumpt.bash
+++ b/test/formatters/installers/gofumpt.bash
@@ -1,6 +1,3 @@
-# Require at least version 1.17 of go
-# https://github.com/mvdan/gofumpt/issues/231
-curl -OL https://golang.org/dl/go1.19.3.linux-amd64.tar.gz
-sudo tar -C /usr/local -xvf go1.19.3.linux-amd64.tar.gz
-/usr/local/go/bin/go install mvdan.cc/gofumpt@latest
-cp -L "$HOME/go/bin/gofumpt" /usr/local/bin/
\ No newline at end of file
+apt-get install -y golang-go
+go install mvdan.cc/gofumpt@latest
+cp -L "$HOME/go/bin/gofumpt" /usr/local/bin/
diff --git a/test/formatters/installers/goimports.bash b/test/formatters/installers/goimports.bash
index 18d4471..8b0b550 100644
--- a/test/formatters/installers/goimports.bash
+++ b/test/formatters/installers/goimports.bash
@@ -1,3 +1,3 @@
 apt-get install -y golang-go
-go get -u golang.org/x/tools/cmd/goimports
-cp -L "$HOME/go/bin/goimports" /usr/local/bin/
\ No newline at end of file
+go install golang.org/x/tools/cmd/goimports@latest
+cp -L "$HOME/go/bin/goimports" /usr/local/bin/