test gh actions

mcandre · Jan 3, 2024 · 1bca479 · 1bca479
1 parent f604391
commit 1bca479
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
@@ -11,11 +11,12 @@ jobs:
     env:
       GOPATH: "/home/runner/go"
     steps:
-    - run: "echo \"${PATH}:${GOPATH}/bin\" >> $GITHUB_PATH"
+    - run: "echo \"/usr/local/go/bin\" >> $GITHUB_PATH"
+    - run: "echo \"${GOPATH}/bin\" >> $GITHUB_PATH"
     - uses: "actions/checkout@v4"
-    - run: "sudo apt-add-repository ppa:longsleep/golang-backports"
-    - run: "sudo apt-get update"
-    - run: "sudo apt-get install -y cargo golang-1.21 make npm"
+    - run: "sudo apt-get install -y cargo make npm wget"
+    - run: "wget https://go.dev/dl/go1.21.5.linux-amd64.tar.gz"
+    - run: "sudo tar -C /usr/local -xzf go1.21.5.linux-amd64.tar.gz"
     - run: "make -f install.mk"
     #
     # Debian-based Ubuntu GitHub Actions base OS is

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -9,10 +9,11 @@ jobs:
     env:
       GOPATH: "/home/runner/go"
     steps:
-    - run: "echo \"${PATH}:${GOPATH}/bin\" >> $GITHUB_PATH"
+    - run: "echo \"/usr/local/go/bin\" >> $GITHUB_PATH"
+    - run: "echo \"${GOPATH}/bin\" >> $GITHUB_PATH"
     - uses: "actions/checkout@v4"
-    - run: "sudo apt-add-repository ppa:longsleep/golang-backports"
-    - run: "sudo apt-get update"
-    - run: "sudo apt-get install -y cargo golang-1.21 make npm"
+    - run: "sudo apt-get install -y cargo make npm wget"
+    - run: "wget https://go.dev/dl/go1.21.5.linux-amd64.tar.gz"
+    - run: "sudo tar -C /usr/local -xzf go1.21.5.linux-amd64.tar.gz"
     - run: "make -f install.mk"
     - run: "make lint"
diff --git a/go.mod b/go.mod
@@ -1,3 +1,3 @@
 module github.com/mcandre/dotfiles
 
-go 1.20
+go 1.21
diff --git a/makefile b/makefile
@@ -25,21 +25,25 @@ snyk:
 
 shfmt:
 	stank -exInterp zsh . | \
+		grep -v .sample | \
 		xargs -n 1 shfmt -w -i 4
 
 bashate:
 	stank . | \
+		grep -v .sample | \
 		xargs -n 1 bashate -i E006
 
 funk:
 	funk .
 
 slick:
 	stank -sh . | \
+		grep -v .sample | \
 		xargs -n 1 slick
 
 shellcheck:
 	stank -exInterp zsh . | \
+		grep -v .sample | \
 		xargs -n 1 shellcheck
 
 unmake: