Sync with gitlab (#1)

proemergotech · Mar 8, 2022 · 0cad7d0 · 0cad7d0
1 parent da16514
commit 0cad7d0
Show file tree

Hide file tree

Showing 13 changed files with 77 additions and 87 deletions.
diff --git a/.editorconfig b/.editorconfig
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,38 @@
+name: CI
+on: [push, workflow_dispatch]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    container: golang:1.17
+    steps:
+      - uses: actions/checkout@v2
+
+      - run: go test -mod=readonly -race -v ./...
+
+  verify:
+    if: github.ref_type == 'branch' && github.ref_name != 'master'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - run: ./verify.sh
+
+  build:
+    runs-on: ubuntu-latest
+    container: golang:1.17
+    steps:
+      - uses: actions/checkout@v2
+
+      - run: go build -a -mod=readonly -o /dev/null ./...
+
+  lint:
+    runs-on: ubuntu-latest
+    container: golang:1.17
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: golangci/golangci-lint-action@v2
+        with:
+          version: v1.44.2
+          args: -c .golangci.yml
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,10 +1,10 @@
 run:
   # timeout for analysis, e.g. 30s, 5m, default is 1m
-  deadline: 1m
-
+  timeout: 1m
+  
   # include test files or not, default is true
   tests: true
-
+  
   # by default isn't set. If set we pass it to "go list -mod={option}". From "go help modules":
   # If invoked with -mod=readonly, the go command is disallowed from the implicit
   # automatic updating of go.mod described above. Instead, it fails when any changes
@@ -20,14 +20,14 @@ linters:
   enable:
     - deadcode
     - errcheck
+    - exportloopref
     - goconst
     - goimports
-    - golint
+    - revive
     - gosec
     - govet
     - ineffassign
     - prealloc
-    - scopelint
     - staticcheck
     - structcheck
     - typecheck
@@ -48,9 +48,17 @@ issues:
   # excluded by default patterns execute `golangci-lint run --help`
   exclude:
     - "declaration of \"err\" shadows declaration at"
-
+    - "Consider preallocating `details`"
+    - "Consider preallocating `publicDetails`"
+    - "`ctx` is unused"
+
+  exclude-rules:
+    - path: _test\.go
+      linters:
+        - goconst
+
   # Maximum issues count per one linter. Set to 0 to disable. Default is 50.
   max-per-linter: 0
-
+  
   # Maximum count of issues with the same text. Set to 0 to disable. Default is 3.
   max-same-issues: 0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Release Notes
 
+## v1.1.0 / 2022-03-08
+- sync with gitlab
+
 ## v1.0.1 / 2020-11-23
 - migrated to GitHub
 

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019
+Copyright (c) 2022 Pro Emergotech Ltd.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,2 +1 @@
-Shallow-go
-==============================
+[![Go Reference](https://pkg.go.dev/badge/github.com/proemergotech/shallow.svg)](https://pkg.go.dev/github.com/proemergotech/shallow)
diff --git a/go.mod b/go.mod
@@ -1,8 +1,10 @@
 module github.com/proemergotech/shallow
 
-go 1.15
+go 1.17
 
 require (
 	github.com/kr/pretty v0.1.0
-	github.com/pkg/errors v0.8.1
+	github.com/proemergotech/errors/v2 v2.0.0
 )
+
+require github.com/kr/text v0.1.0 // indirect
diff --git a/go.sum b/go.sum
@@ -3,5 +3,5 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/proemergotech/errors/v2 v2.0.0 h1:wNHZOMnDV95Su5jseNlopKv5kxv2f41frl3enghl/jo=
+github.com/proemergotech/errors/v2 v2.0.0/go.mod h1:gCeVJJcI1aU2BiaN/N99Fmd6CDsIRXMGOht80M3cWEg=
diff --git a/shallow.go b/shallow.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/pkg/errors"
+	"github.com/proemergotech/errors/v2"
 )
 
 type options struct {

diff --git a/shallow_diff_test.go b/shallow_diff_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/kr/pretty"
-	"github.com/pkg/errors"
+	"github.com/proemergotech/errors/v2"
 )
 
 func TestDiff(t *testing.T) {

diff --git a/shallow_merge_test.go b/shallow_merge_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/kr/pretty"
-	"github.com/pkg/errors"
+	"github.com/proemergotech/errors/v2"
 )
 
 func TestMerge(t *testing.T) {

diff --git a/shallow_test.go b/shallow_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/kr/pretty"
-	"github.com/pkg/errors"
+	"github.com/proemergotech/errors/v2"
 )
 
 type test struct {

diff --git a/verify.sh b/verify.sh
@@ -1,13 +1,20 @@
 #!/bin/sh
-# Check for CHANGELOG updates and fails when not found
+
 changelog_filename="CHANGELOG.md"
 
 git fetch --depth 1 origin master
+
+if ! git diff --name-only origin/master | grep -E '.*\.go|go.mod|go.sum'
+then
+  echo "Go code change not found."
+  exit 0
+fi
+
 if [ -f ${changelog_filename} ]
 then
     if [ "$(git diff --name-only origin/master -- ${changelog_filename} | grep -cw ${changelog_filename})" -ne 1 ]
     then
         echo "Changelog should be updated!"
         exit 1
     fi
-fi
+fi