Merge pull request #221 from hugoh/chores

chores

Author: hugoh

.github/workflows/ci.yml

@@ -33,63 +33,41 @@ jobs:
     outputs:
       tools: ${{ steps.mise.outputs.tools }}
     steps:
-      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5
+      - &checkout
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5
         with:
           persist-credentials: false
       - uses: yshrsmz/action-mise-values@92f49c5a07ebc7ffa957be5efa6a2c673578bbb0
         id: mise
 
-  lint:
+  goci:
     needs: versions
     runs-on: ubuntu-latest
     permissions:
       contents: read
     steps:
-      - &checkout
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5
-        with:
-          persist-credentials: false
+      - *checkout
       - &setup-go
         uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff
         with:
           go-version: ${{ fromJson(needs.versions.outputs.tools).go }}
-      - uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20
-        with:
-          version: v${{ fromJson(needs.versions.outputs.tools).golangci-lint }}
-
-  test:
-    needs: versions
-    environment: test
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    steps:
-      - *checkout
-      - *setup-go
       - uses: jdx/mise-action@1648a7812b9aeae629881980618f079932869151
+      - name: Lint
+        run: mise lint
       - name: Test
         run: mise test
       - name: Coverage
-        run: mise run covercheck
+        run: mise covercheck
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-
-  build:
-    needs: [versions, lint, test]
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    steps:
-      - *checkout
-      - *setup-go
       - name: Build
         run: go build .
 
   release:
     runs-on: ubuntu-latest
-    needs: [hk, versions, build]
+    needs: [hk, versions, goci]
     if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     permissions:
       contents: write

dprint.json

@@ -0,0 +1,19 @@
+{
+  "json": {
+  },
+  "markdown": {
+  },
+  "toml": {
+  },
+  "yaml": {
+  },
+  "excludes": [
+    "**/*-lock.json"
+  ],
+  "plugins": [
+    "https://plugins.dprint.dev/json-0.21.3.wasm",
+    "https://plugins.dprint.dev/markdown-0.21.1.wasm",
+    "https://plugins.dprint.dev/toml-0.7.0.wasm",
+    "https://plugins.dprint.dev/g-plane/pretty_yaml-v0.6.0.wasm"
+  ]
+}

hk.pkl

@@ -5,8 +5,8 @@ local linters = new Mapping<String, Step> {
     ["golangci-lint"] = (Builtins.golangci_lint) {
         profiles = List("!ci")
     }
-    ["markdown-lint"] = Builtins.markdown_lint
-    ["prettier"]      = Builtins.prettier
+    ["markdown"] = Builtins.rumdl
+    ["dprint"]      = Builtins.dprint
     ["zizmor"]        = Builtins.zizmor
 }
 

internal/gateway.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	tmhi "github.com/hugoh/tmhi-gateway"
-	"github.com/pterm/pterm"
 )
 
 var errUnknownGateway = errors.New("unknown gateway")
@@ -28,8 +27,6 @@ func getGateway(cfg *Config) (tmhi.Gateway, error) {
 	case NOK5G21:
 		return tmhi.NewNokiaGateway(gwConfig), nil
 	default:
-		pterm.Error.Printf("unsupported gateway: \"%s\"\n", cfg.Model)
-
-		return nil, fmt.Errorf("%w: %s", errUnknownGateway, cfg.Model)
+		return nil, fmt.Errorf("%w: \"%s\"", errUnknownGateway, cfg.Model)
 	}
 }

mise.toml

@@ -6,9 +6,9 @@ golangci-lint = "2.11.4"
 goreleaser = "2.15.3"
 gotestsum = "1.13.0"
 hk = "1.43.0"
-"npm:markdownlint-cli" = "0.48.0"
-prettier = "3.8.3"
+rumdl = "0.1.80"
 zizmor = "1.24.1"
+dprint = "0.54.0"
 
 [env]
 COVEROUT = "cover.out"
@@ -19,7 +19,6 @@ description = "Lint code"
 run = [
   "go mod tidy -diff",
   "golangci-lint run ./...",
-  "prettier --check .",
   "goreleaser check",
 ]
 
@@ -40,6 +39,11 @@ run = "go-test-coverage -config .testcoverage.yml"
 description = "Run CI checks (lint, test, coverage)"
 depends = ["lint", "test", "covercheck"]
 
+[tasks.full-ci]
+description = "Run CI checks + HK linting"
+depends = "ci"
+run = "hk check --profile ci --quiet"
+
 [tasks.clean]
 description = "Clean the project"
 run = ["go clean", "rm -f ${COVEROUT}"]
@@ -50,7 +54,7 @@ run = "golangci-lint run --fix ./..."
 
 [tasks.format]
 description = "Format the code"
-run = ["golangci-lint fmt ./...", "prettier --write ."]
+run = "golangci-lint fmt ./..."
 
 [tasks.tidy]
 description = "Tidy the module"

tmhi-cli.toml

@@ -4,4 +4,4 @@ password = "s3cret"
 
 [gateway]
 model = "NOK5G21"
-ip = "192.168.12.1"
+ip = "192.168.12.1"