From c57a578d1d9e65f5a05a2490077018bccb5639ff Mon Sep 17 00:00:00 2001
From: "Anuraag (Rag) Agrawal" <anuraaga@gmail.com>
Date: Wed, 1 May 2024 16:05:57 +0900
Subject: [PATCH] Switch from mage.go file to folder (#93)

---
 .github/workflows/bench.yaml | 4 ++--
 .github/workflows/ci.yaml    | 6 +++---
 go.mod                       | 3 ++-
 go.work                      | 1 +
 mage/go.mod                  | 5 +++++
 mage/go.sum                  | 2 ++
 mage.go => mage/main.go      | 3 ---
 7 files changed, 15 insertions(+), 9 deletions(-)
 create mode 100644 mage/go.mod
 create mode 100644 mage/go.sum
 rename mage.go => mage/main.go (86%)

diff --git a/.github/workflows/bench.yaml b/.github/workflows/bench.yaml
index 1fedeea..88c4d3a 100644
--- a/.github/workflows/bench.yaml
+++ b/.github/workflows/bench.yaml
@@ -21,9 +21,9 @@ jobs:
       - name: setup re2 for cgo
         run: sudo apt-get update && sudo apt-get install -y libre2-dev
 
-      - run: go run mage.go benchall
+      - run: go run mage benchall
 
-      - run: go run mage.go wafbenchall
+      - run: go run mage wafbenchall
 
       - uses: actions/upload-artifact@v3
         with:
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index eab4780..b16a312 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -60,7 +60,7 @@ jobs:
         run: go install github.com/wasilibs/tools/cmd/wasmtime@875fe73f677c58d467ee373a9e00e6cb66b268f3
 
       - name: run checks
-        run: go run mage.go check
+        run: go run mage check
         if: ${{ !startsWith(matrix.os, 'windows-') || matrix.mode != 'cgo' }}
         env:
           RE2_TEST_MODE: ${{ matrix.mode }}
@@ -73,7 +73,7 @@ jobs:
           TEST_NORACE: ${{ startsWith(matrix.os, 'windows-') && matrix.mode == 'wazero' && 'true' || '' }}
 
       - name: run checks (windows cgo)
-        run: go run mage.go check
+        run: go run mage check
         if: ${{ startsWith(matrix.os, 'windows-') && matrix.mode == 'cgo' }}
         # Shell does not support conditional expressions using matrix, so for now we duplicate the steps
         shell: 'msys2 {0}'
@@ -98,6 +98,6 @@ jobs:
 
       - run: if command -v gcc &> /dev/null; then echo "GCC found but not expected"; exit 321; fi
 
-      - run: go run mage.go test
+      - run: go run mage test
         env:
           TEST_NORACE: "true"
diff --git a/go.mod b/go.mod
index bf5fe18..3f37e78 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,8 @@ module github.com/wasilibs/go-re2
 go 1.20
 
 require (
-	github.com/magefile/mage v1.14.0
 	github.com/tetratelabs/wazero v1.7.1
 	github.com/wasilibs/nottinygc v0.4.0
 )
+
+require github.com/magefile/mage v1.14.0 // indirect
diff --git a/go.work b/go.work
index f52eb40..99d6439 100644
--- a/go.work
+++ b/go.work
@@ -3,6 +3,7 @@ go 1.20
 use (
 	.
 	./internal/e2e
+	./mage
 	./magefiles
 	./wafbench
 )
diff --git a/mage/go.mod b/mage/go.mod
new file mode 100644
index 0000000..360101d
--- /dev/null
+++ b/mage/go.mod
@@ -0,0 +1,5 @@
+module mage
+
+go 1.20
+
+require github.com/magefile/mage v1.15.1-0.20230912152418-9f54e0f83e2a
diff --git a/mage/go.sum b/mage/go.sum
new file mode 100644
index 0000000..49ab18d
--- /dev/null
+++ b/mage/go.sum
@@ -0,0 +1,2 @@
+github.com/magefile/mage v1.15.1-0.20230912152418-9f54e0f83e2a h1:tdPcGgyiH0K+SbsJBBm2oPyEIOTAvLBwD9TuUwVtZho=
+github.com/magefile/mage v1.15.1-0.20230912152418-9f54e0f83e2a/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
diff --git a/mage.go b/mage/main.go
similarity index 86%
rename from mage.go
rename to mage/main.go
index 2574b85..298f01a 100644
--- a/mage.go
+++ b/mage/main.go
@@ -1,6 +1,3 @@
-//go:build tools
-// +build tools
-
 // Entrypoint to mage for running without needing to install the command.
 // https://magefile.org/zeroinstall/
 package main