From 7bd54c6f4efd031aec40227d8c5fe1a84467d787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oscar=20S=C3=B6derlund?= <odsod@users.noreply.github.com>
Date: Tue, 18 Jan 2022 13:04:28 +0100
Subject: [PATCH] ci: bump mage-tools

Moving to (hopefully) stable Makefile format.
---
 .mage/go.mod   |  2 +-
 .mage/go.sum   |  4 ++--
 .mage/tools.mk | 10 ----------
 Makefile       | 48 ++++++++++++++++++++++++++++--------------------
 4 files changed, 31 insertions(+), 33 deletions(-)
 delete mode 100644 .mage/tools.mk

diff --git a/.mage/go.mod b/.mage/go.mod
index c99a103..36326d0 100644
--- a/.mage/go.mod
+++ b/.mage/go.mod
@@ -4,7 +4,7 @@ go 1.17
 
 require (
 	github.com/magefile/mage v1.12.1
-	go.einride.tech/mage-tools v0.20.0
+	go.einride.tech/mage-tools v0.27.0
 )
 
 require (
diff --git a/.mage/go.sum b/.mage/go.sum
index bdd8d93..f78c284 100644
--- a/.mage/go.sum
+++ b/.mage/go.sum
@@ -6,8 +6,8 @@ github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHL
 github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
 github.com/magefile/mage v1.12.1 h1:oGdAbhIUd6iKamKlDGVtU6XGdy5SgNuCWn7gCTgHDtU=
 github.com/magefile/mage v1.12.1/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
-go.einride.tech/mage-tools v0.20.0 h1:KBFsi2zxsHe+fF/syg68vRZA6JcoKgpk0LkRijuM7kU=
-go.einride.tech/mage-tools v0.20.0/go.mod h1:pFpCBZ0U7a6862mks4y6v5xBkT4IhdrcJdEeTEjweMI=
+go.einride.tech/mage-tools v0.27.0 h1:WHDPcv9Om7p5vM8/KRf+5bWPwnPpT1tNhONTJltWvxc=
+go.einride.tech/mage-tools v0.27.0/go.mod h1:pFpCBZ0U7a6862mks4y6v5xBkT4IhdrcJdEeTEjweMI=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
diff --git a/.mage/tools.mk b/.mage/tools.mk
deleted file mode 100644
index 62da3d2..0000000
--- a/.mage/tools.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-mage_dir := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
-mage_tools_path := $(mage_dir)/tools
-mage := $(mage_tools_path)/mgmake/magefile
-
-$(mage): $(mage_dir)/go.mod $(mage_dir)/*.go
-	@cd $(mage_dir) && go run go.einride.tech/mage-tools gen
-
-.PHONY: mage-clean
-mage-clean:
-	@git clean -fdx $(mage_dir)
diff --git a/Makefile b/Makefile
index fa18216..316faae 100644
--- a/Makefile
+++ b/Makefile
@@ -1,44 +1,52 @@
-# Code generated by Mage-tools. DO NOT EDIT.
+# Code generated by go.einride.tech/mage-tools. DO NOT EDIT.
+# To learn more, see .mage/magefile.go and https://github.com/einride/mage-tools.
 
 .DEFAULT_GOAL := all
 
-include .mage/tools.mk
+magefile := .mage/tools/bin/magefile
+
+$(magefile): .mage/go.mod .mage/*.go
+	@cd .mage && go run go.einride.tech/mage-tools/cmd/build
+
+.PHONY: clean-mage-tools
+clean-mage-tools:
+	@git clean -fdx .mage/tools
 
 .PHONY: all
-all: $(mage)
-	@$(mage) all
+all: $(magefile)
+	@$(magefile) all
 
 .PHONY: convco-check
-convco-check: $(mage)
+convco-check: $(magefile)
 ifndef rev
 	$(error missing argument rev="...")
 endif
-	@$(mage) convcoCheck $(rev)
+	@$(magefile) convcoCheck $(rev)
 
 .PHONY: format-markdown
-format-markdown: $(mage)
-	@$(mage) formatMarkdown
+format-markdown: $(magefile)
+	@$(magefile) formatMarkdown
 
 .PHONY: format-yaml
-format-yaml: $(mage)
-	@$(mage) formatYaml
+format-yaml: $(magefile)
+	@$(magefile) formatYaml
 
 .PHONY: git-verify-no-diff
-git-verify-no-diff: $(mage)
-	@$(mage) gitVerifyNoDiff
+git-verify-no-diff: $(magefile)
+	@$(magefile) gitVerifyNoDiff
 
 .PHONY: go-mod-tidy
-go-mod-tidy: $(mage)
-	@$(mage) goModTidy
+go-mod-tidy: $(magefile)
+	@$(magefile) goModTidy
 
 .PHONY: go-test
-go-test: $(mage)
-	@$(mage) goTest
+go-test: $(magefile)
+	@$(magefile) goTest
 
 .PHONY: golangci-lint
-golangci-lint: $(mage)
-	@$(mage) golangciLint
+golangci-lint: $(magefile)
+	@$(magefile) golangciLint
 
 .PHONY: goreview
-goreview: $(mage)
-	@$(mage) goreview
+goreview: $(magefile)
+	@$(magefile) goreview