From 17824b21653481d61c73d09456396d9c91d4ad1e Mon Sep 17 00:00:00 2001
From: Marcelo Cantos <marcelo.cantos@gmail.com>
Date: Sat, 28 Oct 2023 00:03:55 +1100
Subject: [PATCH] misc fixes

---
 .github/workflows/go.yml |  8 +++++---
 gen-kv.pl                | 15 ---------------
 gen-kv.sh                | 28 ----------------------------
 3 files changed, 5 insertions(+), 46 deletions(-)
 delete mode 100755 gen-kv.pl
 delete mode 100755 gen-kv.sh

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 586ed08..4c7506e 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -21,13 +21,15 @@ jobs:
     - name: Check out code into the Go module directory
       uses: actions/checkout@v3
 
+    - name: golangci-lint
+      uses: golangci/golangci-lint-action@v3
+      with:
+        version: v1.55.1
+
     - name: Install go bits
       run: |
-        go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
         go install golang.org/x/tools/cmd/goimports@latest
         export PATH=$PATH:$(go env GOPATH)/bin
-        ls $(go env GOPATH)/bin
-        golangci-lint version
 
     - name: Build
       run: go build -v ./...
diff --git a/gen-kv.pl b/gen-kv.pl
deleted file mode 100755
index ad02dee..0000000
--- a/gen-kv.pl
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/perl
-
-$PACKAGE = $ARGV[0];
-$TYPE = $ARGV[1];
-
-print "// Generated by gen-kv.pl $PACKAGE $TYPE. DO NOT EDIT.\n";
-
-while (<STDIN>) {
-    s{^package \w+$}{package $PACKAGE};
-    if ($PACKAGE eq 'kvt') {
-        s{(^package \w*)}{\1\nimport "github.com/arr-ai/frozen/pkg/kv"};
-        s{"(github.com/arr-ai/frozen/internal/iterator)"}{"\1/kvi"};
-    }
-    print;
-}
diff --git a/gen-kv.sh b/gen-kv.sh
deleted file mode 100755
index faf7f70..0000000
--- a/gen-kv.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-set -e
-
-SRCDIR=$1
-OUTDIR=$2
-
-shift 2
-FILES="$@"
-
-PACKAGE=$(basename $OUTDIR)
-
-mkdir -p $OUTDIR
-
-TYPE=KeyValue
-
-for f in $FILES; do
-    if [ -f $OUTDIR/$f ]; then
-        chmod +w $OUTDIR/$f
-    fi
-    ./gen-kv.pl "$PACKAGE" "$TYPE" < $SRCDIR/$f > $OUTDIR/$f
-done
-
-goimports -w -local $(head -1 go.mod | awk '{print$2}') $OUTDIR
-
-for f in $FILES; do
-    chmod -w $OUTDIR/$f
-done