Skip to content

Commit 710114f

Browse files
authored
Bump up net module (#166)
1 parent b8bad0c commit 710114f

5 files changed

Lines changed: 30 additions & 22 deletions

File tree

.github/workflows/license-checker.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,4 @@ jobs:
3939
with:
4040
go-version: "1.16"
4141
- name: Check Dependencies License
42-
run: |
43-
go install github.com/apache/skywalking-eyes/cmd/license-eye@d38fe0561d1140b010bddccb5fbfa3db7c12caf1
44-
license-eye dependency resolve --summary ./dist/LICENSE.tpl --output ./dist/licenses || exit 1
45-
if [ ! -z "$(git diff -U0 ./dist)" ]; then
46-
echo "LICENSE file is not updated correctly"
47-
git diff -U0 ./dist
48-
exit 1
49-
fi
42+
run: make dependency-license

Makefile

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ deps:
6060
$(GO_LINT):
6161
@$(GO_LINT) version > /dev/null 2>&1 || go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
6262
$(LICENSE_EYE):
63-
@$(LICENSE_EYE) --version > /dev/null 2>&1 || go install github.com/apache/skywalking-eyes/cmd/license-eye@latest
63+
@$(LICENSE_EYE) --version > /dev/null 2>&1 || go install github.com/apache/skywalking-eyes/cmd/license-eye@d38fe05
6464

6565
.PHONY: lint
6666
lint: $(GO_LINT)
@@ -69,13 +69,30 @@ lint: $(GO_LINT)
6969
fix-lint: $(GO_LINT)
7070
$(GO_LINT) run -v --fix ./...
7171

72-
.PHONY: license
73-
license: clean $(LICENSE_EYE)
72+
.PHONY: license-header
73+
license-header: clean $(LICENSE_EYE)
7474
@$(LICENSE_EYE) header check
75-
.PHONY: fix-license
76-
fix-license: clean $(LICENSE_EYE)
75+
76+
.PHONY: fix-license-header
77+
fix-license-header: clean $(LICENSE_EYE)
7778
@$(LICENSE_EYE) header fix
7879

80+
.PHONY: dependency-license
81+
dependency-license: clean $(LICENSE_EYE)
82+
@$(LICENSE_EYE) dependency resolve --summary ./dist/LICENSE.tpl --output ./dist/licenses || exit 1
83+
@if [ ! -z "`git diff -U0 ./dist`" ]; then \
84+
echo "LICENSE file is not updated correctly"; \
85+
git diff -U0 ./dist; \
86+
exit 1; \
87+
fi
88+
89+
.PHONY: fix-dependency-license
90+
fix-dependency-license: clean $(LICENSE_EYE)
91+
@$(LICENSE_EYE) dependency resolve --summary ./dist/LICENSE.tpl --output ./dist/licenses
92+
93+
.PHONY: fix-license
94+
fix-license: fix-license-header fix-dependency-license
95+
7996
.PHONY: fix
8097
fix: fix-lint fix-license
8198

dist/LICENSE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,10 +357,10 @@ The text of each license is also included at licenses/license-[project].txt.
357357
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 BSD-3-Clause
358358
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 BSD-3-Clause
359359
golang.org/x/mod v0.4.2 BSD-3-Clause
360-
golang.org/x/net v0.0.0-20220421235706-1d1ef9303861 BSD-3-Clause
360+
golang.org/x/net v0.0.0-20220909164309-bea034e7d591 BSD-3-Clause
361361
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d BSD-3-Clause
362362
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c BSD-3-Clause
363-
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 BSD-3-Clause
363+
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 BSD-3-Clause
364364
golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 BSD-3-Clause
365365
golang.org/x/text v0.3.7 BSD-3-Clause
366366
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac BSD-3-Clause

go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ require (
1919
github.com/spf13/viper v1.7.0
2020
github.com/urfave/cli/v2 v2.3.0
2121
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
22-
golang.org/x/net v0.0.0-20220421235706-1d1ef9303861 // indirect
23-
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect
22+
golang.org/x/net v0.0.0-20220909164309-bea034e7d591 // indirect
2423
golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 // indirect
2524
golang.org/x/text v0.3.7
2625
google.golang.org/grpc v1.40.0

go.sum

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -574,8 +574,8 @@ golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT
574574
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
575575
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
576576
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
577-
golang.org/x/net v0.0.0-20220421235706-1d1ef9303861 h1:yssD99+7tqHWO5Gwh81phT+67hg+KttniBr6UnEXOY8=
578-
golang.org/x/net v0.0.0-20220421235706-1d1ef9303861/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
577+
golang.org/x/net v0.0.0-20220909164309-bea034e7d591 h1:D0B/7al0LLrVC8aWF4+oxpv/m8bc7ViFfVS8/gXGdqI=
578+
golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
579579
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
580580
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
581581
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -641,9 +641,8 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
641641
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
642642
golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
643643
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
644-
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
645-
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 h1:xHms4gcpe1YE7A3yIllJXP16CMAGuqwO2lX1mTyyRRc=
646-
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
644+
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg=
645+
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
647646
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
648647
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
649648
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=

0 commit comments

Comments
 (0)