diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml index ede314d..f161ec8 100644 --- 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 index 1d0fe36..12cd9ab 100644 --- 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 index a36e8ed..51a0b67 100644 --- 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 index dd81e30..1446454 100644 --- a/makefile +++ b/makefile @@ -25,10 +25,12 @@ 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: @@ -36,10 +38,12 @@ funk: slick: stank -sh . | \ + grep -v .sample | \ xargs -n 1 slick shellcheck: stank -exInterp zsh . | \ + grep -v .sample | \ xargs -n 1 shellcheck unmake: