This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-eyes.git
The following commit(s) were added to refs/heads/main by this push:
new d7cc2d5 Fix wrong path of Dockerfile in action.yaml (#16)
d7cc2d5 is described below
commit d7cc2d55e706869d52400f6bac146977439b2744
Author: Zhenxu Ke <[email protected]>
AuthorDate: Sun Dec 27 19:00:13 2020 +0800
Fix wrong path of Dockerfile in action.yaml (#16)
---
.asf.yaml | 2 +-
.golangci.yml | 2 +-
Makefile | 14 +++++++++-----
action.yml | 9 ++++++---
commands/deps_resolve.go | 3 ++-
commands/header_fix.go | 3 ++-
pkg/comments/config.go | 3 ++-
pkg/deps/golang.go | 5 +++--
pkg/review/header.go | 5 +++--
9 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index 0398b73..31e4a2f 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -17,7 +17,7 @@
#
github:
- description: Infra tools created and used by Apache SkyWalking
+ description: A full-featured license tool to check and fix license headers
and resolve dependencies' licenses.
homepage: https://skywalking.apache.org/
labels:
- cli
diff --git a/.golangci.yml b/.golangci.yml
index f4a6fee..79ddd86 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -75,7 +75,7 @@ linters-settings:
lll:
line-length: 150
goimports:
- local-prefixes: github.com/apache/skywalking-cli
+ local-prefixes: github.com/apache/skywalking-eyes/license-eye
gocritic:
enabled-tags:
- diagnostic
diff --git a/Makefile b/Makefile
index c2df156..913bf55 100644
--- a/Makefile
+++ b/Makefile
@@ -87,11 +87,15 @@ clean:
verify: clean license lint test
release-src: clean
- -mkdir $(RELEASE_SRC)
- -cp ../NOTICE $(RELEASE_SRC)
- -rsync -av . $(RELEASE_SRC) --exclude $(RELEASE_SRC) --exclude .DS_Store
- -tar -zcvf $(RELEASE_SRC).tgz $(RELEASE_SRC)
- -rm -rf "$(RELEASE_SRC)"
+ -tar -zcvf $(RELEASE_SRC).tgz \
+ --exclude bin \
+ --exclude .git \
+ --exclude .idea \
+ --exclude .DS_Store \
+ --exclude .github \
+ --exclude $(RELEASE_SRC).tgz \
+ --exclude query-protocol/schema.graphqls \
+ .
release-bin: build
-mkdir $(RELEASE_BIN)
diff --git a/action.yml b/action.yml
index fe7cbd3..14f7104 100644
--- a/action.yml
+++ b/action.yml
@@ -16,12 +16,15 @@
# under the License.
#
name: License Eye
-description: A full-featured license guard to check and fix license headers
and dependencies' licenses.
+description: A full-featured license tool to check and fix license headers and
dependencies' licenses.
branding:
icon: book
color: orange
runs:
using: docker
- image: license-eye/Dockerfile
+ image: Dockerfile
args:
- - header check
+ - -v
+ - debug
+ - header
+ - check
diff --git a/commands/deps_resolve.go b/commands/deps_resolve.go
index 4969da7..2068abe 100644
--- a/commands/deps_resolve.go
+++ b/commands/deps_resolve.go
@@ -21,8 +21,9 @@ import (
"fmt"
"strings"
- "github.com/apache/skywalking-eyes/license-eye/pkg/deps"
"github.com/spf13/cobra"
+
+ "github.com/apache/skywalking-eyes/license-eye/pkg/deps"
)
var ResolveCommand = &cobra.Command{
diff --git a/commands/header_fix.go b/commands/header_fix.go
index 4f1e50f..a022636 100644
--- a/commands/header_fix.go
+++ b/commands/header_fix.go
@@ -22,9 +22,10 @@ import (
"fmt"
"strings"
+ "github.com/spf13/cobra"
+
"github.com/apache/skywalking-eyes/license-eye/internal/logger"
"github.com/apache/skywalking-eyes/license-eye/pkg/header"
- "github.com/spf13/cobra"
)
var FixCommand = &cobra.Command{
diff --git a/pkg/comments/config.go b/pkg/comments/config.go
index 28f4462..71586b3 100644
--- a/pkg/comments/config.go
+++ b/pkg/comments/config.go
@@ -21,8 +21,9 @@ import (
"fmt"
"strings"
- "github.com/apache/skywalking-eyes/license-eye/assets"
"gopkg.in/yaml.v3"
+
+ "github.com/apache/skywalking-eyes/license-eye/assets"
)
type CommentStyle struct {
diff --git a/pkg/deps/golang.go b/pkg/deps/golang.go
index c198373..33abc5a 100644
--- a/pkg/deps/golang.go
+++ b/pkg/deps/golang.go
@@ -26,10 +26,11 @@ import (
"path/filepath"
"regexp"
- "github.com/apache/skywalking-eyes/license-eye/internal/logger"
- "github.com/apache/skywalking-eyes/license-eye/pkg/license"
"golang.org/x/mod/modfile"
"golang.org/x/tools/go/packages"
+
+ "github.com/apache/skywalking-eyes/license-eye/internal/logger"
+ "github.com/apache/skywalking-eyes/license-eye/pkg/license"
)
type GoModeResolver struct {
diff --git a/pkg/review/header.go b/pkg/review/header.go
index b43cfaa..8c8df5a 100644
--- a/pkg/review/header.go
+++ b/pkg/review/header.go
@@ -29,12 +29,13 @@ import (
"strconv"
"strings"
+ "github.com/google/go-github/v33/github"
+ "golang.org/x/oauth2"
+
"github.com/apache/skywalking-eyes/license-eye/internal/logger"
comments2 "github.com/apache/skywalking-eyes/license-eye/pkg/comments"
config2 "github.com/apache/skywalking-eyes/license-eye/pkg/config"
header2 "github.com/apache/skywalking-eyes/license-eye/pkg/header"
- "github.com/google/go-github/v33/github"
- "golang.org/x/oauth2"
)
var (
