From ab6ee861d800a322bd162b7f2375b3545738683b Mon Sep 17 00:00:00 2001
From: Wen Kokke <wenkokke@users.noreply.github.com>
Date: Wed, 1 Sep 2021 20:16:43 +0100
Subject: [PATCH] Ensure Makefile is loud.

---
 .github/workflows/build.yml | 24 +++++++++++++-----------
 Makefile                    | 36 ++++++++++++++++++++----------------
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8db137df..ba5891da 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,6 +6,13 @@ jobs:
   build:
     runs-on: macOS-latest
 
+    env:
+      # Use the GHC version installed by haskell/actions/setup
+      #
+      # NOTE: Makefile respects the STACK environment variable
+      #
+      STACK: stack --system-ghc --no-install-ghc
+
     strategy:
       matrix:
         ghc: ['8.10.5']
@@ -19,14 +26,12 @@ jobs:
 
     - name: Get Gem Installation Directory
       id: get-gemdir
-      run: |
-        echo "::set-output name=gemdir::$(gem env gemdir)"
+      run: echo "::set-output name=gemdir::$(gem env gemdir)"
       shell: bash
 
     - name: Get Agda version
       id: get-agda-version
-      run: |
-        echo "::set-output name=agda-version::$(cat plfa.cabal | sed -n -e 's/^.*Agda\s*==\s*\(\S*\)\s*/\1/p')"
+      run: echo "::set-output name=agda-version::$(cat plfa.cabal | sed -n -e 's/^.*Agda\s*==\s*\(\S*\)\s*/\1/p')"
       shell: bash
 
     - uses: actions/cache@v2
@@ -41,12 +46,10 @@ jobs:
           ~/.stack
           ${{ steps.get-gemdir.outputs.gemdir }}
           $GITHUB_WORKSPACE/.stack-work
-          $GITHUB_WORKSPACE/_build
-          $GITHUB_WORKSPACE/_cache
-          $GITHUB_WORKSPACE/_site
         key: ${{ runner.os }}-${{ matrix.ghc }}-${{ steps.get-agda-version.outputs.agda-version }}
 
     - name: Setup Haskell
+      if: steps.cache.outputs.cache-hit != 'true'
       uses: haskell/actions/setup@v1
       with:
         ghc-version: ${{ matrix.ghc }}
@@ -54,12 +57,11 @@ jobs:
         stack-version: 'latest'
 
     - name: Setup HTMLProofer
+      if: steps.cache.outputs.cache-hit != 'true'
       run: sudo gem install html-proofer
 
     - name: Build website
-      run: |
-        STACK="stack --system-ghc --no-install-ghc" make build
+      run: make build
 
     - name: Test website
-      run: |
-        STACK="stack --system-ghc --no-install-ghc" make test
+      run: make test
diff --git a/Makefile b/Makefile
index c5d4745d..fe7baf62 100644
--- a/Makefile
+++ b/Makefile
@@ -21,15 +21,15 @@ PANDOC    := $(STACK) exec pandoc --
 
 .PHONY: all
 all:
-	@$(MAKE) build
-	@$(MAKE) epub-build
-	@$(MAKE) pdf-build
+	$(MAKE) build
+	$(MAKE) epub-build
+	$(MAKE) pdf-build
 
 .PHONY: all-clean
 all-clean:
-	@$(MAKE) clean
-	@$(MAKE) epub-clean
-	@$(MAKE) pdf-clean
+	$(MAKE) clean
+	$(MAKE) epub-clean
+	$(MAKE) pdf-clean
 
 #################################################################################
 # Setup Git Hooks
@@ -38,7 +38,7 @@ all-clean:
 .PHONY: init
 init: setup-check-fix-whitespace setup-install-htmlproofer
 	@echo "Setting up Git Hooks"
-	@git config core.hooksPath .githooks
+	git config core.hooksPath .githooks
 
 
 #################################################################################
@@ -48,12 +48,13 @@ init: setup-check-fix-whitespace setup-install-htmlproofer
 .PHONY: build
 build: standard-library/ChangeLog.md
 	@echo "Building site"
-	@$(STACK) build && $(STACK) exec site build
+	$(STACK) build
+	$(STACK) exec site build
 
 standard-library/ChangeLog.md:
 	@echo "Updating Agda standard library"
-	@git submodule init
-	@git submodule update --recursive
+	git submodule init
+	git submodule update --recursive
 
 
 #################################################################################
@@ -63,7 +64,7 @@ standard-library/ChangeLog.md:
 .PHONY: test
 test: setup-install-htmlproofer build
 	@echo "Testing generated HTML using HTMLProofer"
-	@cd $(SITE_DIR) && htmlproofer \
+	cd $(SITE_DIR) && htmlproofer  \
 		--check-html                 \
 		--disable-external           \
 		--report-invalid-tags        \
@@ -84,7 +85,8 @@ test: setup-install-htmlproofer build
 .PHONY: watch
 watch: standard-library/ChangeLog.md
 	@echo "Watching for changes and rebuilding"
-	@$(STACK) build && $(STACK) exec site watch
+	$(STACK) build
+	$(STACK) exec site watch
 
 
 #################################################################################
@@ -94,7 +96,8 @@ watch: standard-library/ChangeLog.md
 .PHONY: update-contributors
 update-contributors:
 	@echo "Updating contributors from GitHub"
-	@$(STACK) build && $(STACK) exec update-contributors
+	$(STACK) build
+	$(STACK) exec update-contributors
 
 
 #################################################################################
@@ -104,7 +107,8 @@ update-contributors:
 .PHONY: clean
 clean: standard-library/ChangeLog.md
 	@echo "Cleaning generated files for site"
-	@$(STACK) build && $(STACK) exec site clean
+	$(STACK) build
+	$(STACK) exec site clean
 
 
 #################################################################################
@@ -123,10 +127,10 @@ list:
 
 .PHONY: publish
 publish: setup-check-rsync
-	@$(MAKE) all
+	$(MAKE) all
 	@echo "Cleaning intermediate files"
 	rm -rf $(RAW_DIR)
-	@$(MAKE) test
+	$(MAKE) test
 	@echo "Creating web branch"
 	git fetch --all
 	git checkout -b web --track origin/web