Improve tooling to prep for rearchitecting the project

.github/workflows/main.yml

@@ -3,18 +3,19 @@ on:
     branches:
       - main
     paths:
-      - "pkg/**"
+      - "pkg/**/*"
+      - "scripts/**/*"
       - "main.go"
       - "go.mod"
 
 jobs:
-  project:
-    name: Project
-    uses: ./.github/workflows/project.yml
+  validate:
+    name: Validate
+    uses: ./.github/workflows/validate.yml
 
   release:
     name: Release
-    needs: project
+    needs: validate
     runs-on: ubuntu-24.04
     permissions:
       contents: write

.github/workflows/project.yml → .github/workflows/validate.yml

@@ -2,17 +2,17 @@ on:
   push:
     branches:
       - main
-    paths:
-      - "!pkg/**"
+    paths: # This workflow is called by main.yml if these files have changed
+      - "!pkg/**/*"
+      - "!scripts/**/*"
       - "!main.go"
       - "!go.mod"
   pull_request:
   workflow_call:
 
 # also update lefthook.yml
 jobs:
-  validate:
-    name: Validate
+  vmatch:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout
@@ -33,10 +33,18 @@ jobs:
         name: Actions
         uses: anttiharju/actions/lint-actions@v0
 
+      - if: always()
+        name: ShellCheck
+        uses: anttiharju/actions/check-shellcheck@v0
+
       - if: always()
         name: Docs
         uses: anttiharju/actions/lint-docs@v0
 
       - if: always()
         name: Prettier
         uses: anttiharju/actions/check-prettier@v0
+
+      - if: always()
+        name: EditorConfig
+        uses: anttiharju/actions/check-editorconfig@v0

.gitignore

@@ -29,3 +29,6 @@ vmatch
 
 # mkdocs build output
 site
+
+# generated by action-validator install
+.tool-versions

.vscode/extensions.json

@@ -0,0 +1,3 @@
+{
+  "recommendations": ["golang.go", "EditorConfig.EditorConfig"]
+}

lefthook.yml

@@ -2,14 +2,13 @@ output:
   - success
   - failure
 
-# also update validate.yml
+# Match to validate.yml
 pre-commit:
   parallel: true
   jobs:
     - name: Build
       run: go build
       glob: "{pkg/*,main.go,go.mod}"
-      stage_fixed: true
 
     - name: Lint
       run: golangci-lint run --fix
@@ -26,12 +25,18 @@ pre-commit:
               action-validator --verbose {} +
           - run: actionlint
       glob: ".github/*"
-      stage_fixed: true
+
+    - name: ShellCheck
+      run: >
+        git ls-files -z | xargs -0 file |
+        grep "script text executable" |
+        cut -d: -f1 | xargs
+        shellcheck --color=always -x
+      glob: "{*.sh,scripts/*}"
 
     - name: Docs
       run: mkdocs build --strict
       glob: "{docs/*,mkdocs.yml}"
-      stage_fixed: true
 
     - name: Prettier
       run: npx prettier --write .

pkg/picker/picker.go

@@ -5,20 +5,24 @@ import (
 	"github.com/anttiharju/vmatch/pkg/wrapper/linter"
 )
 
-func firstArgIsGo(args []string) bool {
-	return len(args) > 0 && args[0] == "go"
+func firstArgIs(arg string, args []string) bool {
+	return len(args) > 0 && args[0] == arg
 }
 
 func SelectWrapper(args []string) int {
-	if firstArgIsGo(args) {
+	if firstArgIs("go", args) {
 		wrappedLanguage := language.Wrap("go")
 		exitCode := wrappedLanguage.Run(args[1:])
 
 		return exitCode
 	}
 
-	wrappedLinter := linter.Wrap("golangci-lint")
-	exitCode := wrappedLinter.Run(args)
+	if firstArgIs("golangci-lint", args) {
+		wrappedLinter := linter.Wrap("golangci-lint")
+		exitCode := wrappedLinter.Run(args)
 
-	return exitCode
+		return exitCode
+	}
+
+	return 1
 }

scripts/go

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+vmatch go "$@"

scripts/golangci-lint

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+vmatch golangci-lint "$@"

scripts/install.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+set -eu
+
+goversion="$1"
+goos="$2"
+goarch="$3"
+path="$4"
+mkdir -p "$path"
+
+url="https://go.dev/dl/go${goversion}.${goos}-${goarch}.tar.gz"
+curl -sL "$url" | tar -C "$path" --strip-components=1 -xz