From 7d9264aea10b65930d27d55d6b082f1d00a027c4 Mon Sep 17 00:00:00 2001
From: Dan Buch <dan@meatballhat.com>
Date: Sun, 11 Sep 2022 18:32:04 -0400
Subject: [PATCH] Replace a few more custom make targets

---
 .github/workflows/cli.yml | 14 +++++++++++---
 Makefile                  | 16 ----------------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
index d146331..53dd2b0 100644
--- a/.github/workflows/cli.yml
+++ b/.github/workflows/cli.yml
@@ -30,11 +30,15 @@ jobs:
       - if: matrix.go == '1.19.x' && matrix.os == 'ubuntu-latest'
         run: make lint
       - run: make vet
-      - run: make tag-test
+      - run: make test
+        env:
+          FLAGS: -tags urfave_cli_no_docs
       - run: make test
       - run: make -C cmd/urfave-cli-genflags
       - run: make check-binary-size
-      - run: make tag-check-binary-size
+        env:
+          FLAGS: -tags urfave_cli_no_docs
+      - run: make check-binary-size
       - run: make yamlfmt
       - run: make diffcheck
       - if: matrix.go == '1.19.x' && matrix.os == 'ubuntu-latest'
@@ -59,6 +63,8 @@ jobs:
       - uses: actions/checkout@v3
       - run: make ensure-gfmrun
       - run: make gfmrun
+        env:
+          FLAGS: --walk docs/v2/
       - run: make diffcheck
   publish:
     permissions:
@@ -71,7 +77,9 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - run: make ci-ensure-mkdocs
+      - run: make ensure-mkdocs
+        env:
+          FLAGS: --upgrade-pip
       - run: make set-mkdocs-remote
         env:
           MKDOCS_REMOTE_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/Makefile b/Makefile
index 46deea2..797d093 100644
--- a/Makefile
+++ b/Makefile
@@ -17,22 +17,6 @@ all: generate vet tag-test test check-binary-size tag-check-binary-size gfmrun y
 %:
 	$(GO_RUN_BUILD) $(GFLAGS) $* $(FLAGS)
 
-.PHONY: tag-test
-tag-test:
-	$(GO_RUN_BUILD) -tags urfave_cli_no_docs test
-
-.PHONY: tag-check-binary-size
-tag-check-binary-size:
-	$(GO_RUN_BUILD) -tags urfave_cli_no_docs check-binary-size
-
-.PHONY: gfmrun
-gfmrun:
-	$(GO_RUN_BUILD) gfmrun --walk docs/v2/
-
-.PHONY: ci-ensure-mkdocs
-ci-ensure-mkdocs:
-	$(GO_RUN_BUILD) ensure-mkdocs --upgrade-pip
-
 .PHONY: docs
 docs:
 	mkdocs build