Makego cleanup (#4079)

Author: bufdev

.github/workflows/make-upgrade.yaml

@@ -28,7 +28,7 @@ jobs:
         run: |
           git config user.name 'github-actions[bot]'
           git config user.email 'github-actions[bot]@users.noreply.github.com'
-      - name: Make upgrade
-        run: bash ./make/buf/scripts/githubactionmakeupgrade.bash
+      - name: make-githubactionupgrade
+        run : make githubactionupgrade
         env:
           GH_TOKEN: ${{ steps.app_token.outputs.token }}

make/buf/all.mk

@@ -179,3 +179,8 @@ checkandupdateprecommithooks:
 	@bash make/buf/scripts/checkandupdateprecommithooks.bash
 
 postupgrade:: checkandupdateprecommithooks
+
+.PHONY: updatebufversion
+updatebufversion:
+	$(SED_I) -E "s/BUF_VERSION \?=.*/BUF_VERSION ?= v${RELEASE_BUF_VERSION}/" "make/go/dep_buf.mk"
+	$(SED_I) -E "s/\# https\:\/\/github.com\/bufbuild\/buf\/releases.*/\# https\:\/\/github.com\/bufbuild\/buf\/releases $(shell date "+%Y%m%d") checked $(shell date "+%Y%m%d")/" "make/go/dep_buf.mk"

make/go/base.mk

@@ -216,6 +216,10 @@ upgradenopost:
 	@$(MAKE) preupgrade
 	@$(MAKE) generate
 
+.PHONY: githubactionupgrade
+githubactionupgrade:
+	bash $(MAKEGO)/scripts/githubactionmakeupgrade.bash
+
 .PHONY: copyfrommakego
 copyfrommakego:
 	@rm -rf $(TMP)/makego

make/go/buf.mk

@@ -62,8 +62,3 @@ bufbreaking: $(BUF)
 postlint:: bufbreaking
 endif
 endif
-
-.PHONY: updatebufversion
-updatebufversion:
-	$(SED_I) -E "s/BUF_VERSION \?=.*/BUF_VERSION ?= v${RELEASE_BUF_VERSION}/" "make/go/dep_buf.mk"
-	$(SED_I) -E "s/\# https\:\/\/github.com\/bufbuild\/buf\/releases.*/\# https\:\/\/github.com\/bufbuild\/buf\/releases $(shell date "+%Y%m%d") checked $(shell date "+%Y%m%d")/" "make/go/dep_buf.mk"

make/go/dep_godoclint.mk

@@ -12,7 +12,7 @@ $(call _assert_var,BUF_VERSION)
 #
 # Based off of dev branch.
 # https://github.com/bufbuild/godoc-lint/commits/dev
-GODOCLINT_VERSION ?= b4372dc9d4f721e956227cbcbd11947d81f246e2
+GODOCLINT_VERSION ?= 5405ef06cd81f5b3115c6e52744f6cd9a8fa84f1a
 
 GODOCLINT := $(CACHE_VERSIONS)/godoclint/$(GODOCLINT_VERSION)
 $(GODOCLINT):

…buf/scripts/githubactionmakeupgrade.bash …/go/scripts/githubactionmakeupgrade.bashmake/buf/scripts/githubactionmakeupgrade.bash renamed to make/go/scripts/githubactionmakeupgrade.bash make/buf/scripts/githubactionmakeupgrade.bash renamed to make/go/scripts/githubactionmakeupgrade.bash

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+# Managed by makego. DO NOT EDIT.
+
 set -euo pipefail
 
 DIR="$(CDPATH= cd "$(dirname "${0}")/../../.." && pwd)"