From 35c844c1dcf0df57271a15d72c27c3f7a8f80089 Mon Sep 17 00:00:00 2001
From: Peter Kurfer <peter.kurfer@googlemail.com>
Date: Fri, 12 Nov 2021 13:34:54 +0100
Subject: [PATCH] Fix build

---
 .github/workflows/go.yml | 9 ++-------
 Taskfile.yml             | 8 ++++++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 2838b09..1f346ac 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -20,16 +20,11 @@ jobs:
         with:
           lfs: true
       
-      - name: Install pkger
-        run: go get -u github.com/markbates/pkger/cmd/pkger
-      
       - name: Install Task
-        uses: Arduino/actions/setup-taskfile@master
-        with:
-            version: '3.x'
+        uses: arduino/setup-task@v1
       
       - name: Build & test
-        run: task download-reveal assets test
+        run: task download-reveal test
       
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2
diff --git a/Taskfile.yml b/Taskfile.yml
index 53262ee..c1c3ad0 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -3,6 +3,7 @@ version: '3'
 vars:
   DEBUG_PORT: 2345
   REVEALJS_VERSION: 4.1.2
+  HIGHLIGHTJS_VERSION: 11.3.1
   BINARY_NAME: goveal
   OUT_DIR: ./out
   GO_BUILD_ARGS: -ldflags="-w -s"
@@ -43,6 +44,7 @@ tasks:
       - ./**/*.go
     deps:
       - deps
+      - fmt
     cmds:
       - mkdir -p {{ .OUT_DIR }}
       - go test -coverprofile={{ .OUT_DIR }}/cov-raw.out -v ./...
@@ -84,6 +86,8 @@ tasks:
       - goreleaser --snapshot --skip-publish --rm-dist
 
   download-reveal:
+    sources:
+      - Taskfile.yml
     cmds:
       - rm -rf ./assets/reveal
       - mkdir -p ./assets/reveal
@@ -92,7 +96,7 @@ tasks:
       - git clone https://github.com/denehyg/reveal.js-menu.git ./assets/reveal/plugin/menu
       - curl -L -o ./assets/reveal/plugin/mouse-pointer/mouse-pointer.js https://raw.githubusercontent.com/caiofcm/plugin-revealjs-mouse-pointer/master/mouse-pointer.js
       - rm -f ./assets/reveal/plugin/menu/{bower.json,CONTRIBUTING.md,LICENSE,package.json,README.md,.gitignore,gulpfile.js,package-lock.json}
-      - curl -L https://github.com/highlightjs/highlight.js/archive/10.4.0.tar.gz | tar -xvz --strip-components=3 -C ./assets/reveal/plugin/highlight --wildcards "*.css" highlight.js-10.4.0/src/styles/
+      - curl -L https://github.com/highlightjs/highlight.js/archive/{{ .HIGHLIGHTJS_VERSION }}.tar.gz | tar -xvz --strip-components=3 -C ./assets/reveal/plugin/highlight --wildcards "*.css" highlight.js-{{ .HIGHLIGHTJS_VERSION }}/src/styles/
 
   go-get-tool:
     vars:
@@ -105,7 +109,7 @@ tasks:
     cmds:
       - task: go-get-tool
         vars:
-          PACKAGE: mvdan.cc/gofumpt@v0.1.1
+          PACKAGE: mvdan.cc/gofumpt@v0.2.0
     status:
       - test -f {{ .GOBIN }}gofumpt