diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml index 2d50dd47..c681330b 100644 --- a/.github/workflows/license.yml +++ b/.github/workflows/license.yml @@ -46,11 +46,9 @@ jobs: # We allow only "notice" type of licenses. run: | go run github.com/google/go-licenses check \ - # Ignore our own codebase. - --ignore github.com/Jigsaw-Code \ + # Ignore our own repo because go-license ignores the root license for submodules we have a submodule. + --ignore github.com/Jigsaw-Code/outline-ss-server \ --ignore=golang.org/x \ - # Missing license file, but Apache-2.0. See https://github.com/uber-go/zap/issues/1441#issuecomment-2389189961. - --ignore=go.uber.org/zap/exp/zapslog \ # TODO: Resolve this indirect Caddy dependency license before releasing the Caddy-backed binary. --ignore github.com/go-sql-driver/mysql \ --allowed_licenses=Apache-2.0,Apache-3,BSD-2-Clause,BSD-3-Clause,BSD-4-Clause,CC0-1.0,ISC,MIT \ diff --git a/go.mod b/go.mod index eacb0b88..792c750f 100644 --- a/go.mod +++ b/go.mod @@ -378,3 +378,6 @@ require ( ) go 1.23 + +// Replace indirect dependency with a newer version that has a LICENSE file. +replace go.uber.org/zap/exp => go.uber.org/zap/exp v0.1.1-0.20240913022758-ede8e1888f83 diff --git a/go.sum b/go.sum index 26477c33..1c0225d3 100644 --- a/go.sum +++ b/go.sum @@ -3013,8 +3013,8 @@ go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= -go.uber.org/zap/exp v0.2.0 h1:FtGenNNeCATRB3CmB/yEUnjEFeJWpB/pMcy7e2bKPYs= -go.uber.org/zap/exp v0.2.0/go.mod h1:t0gqAIdh1MfKv9EwN/dLwfZnJxe9ITAZN78HEWPFWDQ= +go.uber.org/zap/exp v0.1.1-0.20240913022758-ede8e1888f83 h1:wpjRiPjppWaUIH+GC0bRvsdaH2K4Dw49dEJa7MX01Mk= +go.uber.org/zap/exp v0.1.1-0.20240913022758-ede8e1888f83/go.mod h1:5I384qq7XGxYyByIhHm6jg5CHkGY0nsTfbDLgDDlgJQ= go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= gocloud.dev v0.29.0 h1:fBy0jwJSmxs0IjT0fE32MO+Mj+307VZQwyHaTyFZbC4= gocloud.dev v0.29.0/go.mod h1:E3dAjji80g+lIkq4CQeF/BTWqv1CBeTftmOb+gpyapQ=