Skip to content
This repository was archived by the owner on Nov 27, 2023. It is now read-only.

Commit 19ac0ad

Browse files
committed
Switch to using addlicense for copyright header validation
Signed-off-by: Piotr Stankiewicz <[email protected]>
1 parent f922ff9 commit 19ac0ad

File tree

6 files changed

+6
-63
lines changed

6 files changed

+6
-63
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ RUN --mount=target=. \
108108
make -f builder.Makefile test
109109

110110
FROM base AS check-license-headers
111-
RUN go get -u github.com/kunalkushwaha/ltag
111+
RUN go install github.com/google/addlicense@latest
112112
RUN --mount=target=. \
113113
make -f builder.Makefile check-license-headers
114114

scripts/validate/fileheader

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env sh
22

3-
# Copyright Docker Compose CLI authors
3+
# Copyright 2020, 2022 Docker Compose CLI authors
44

55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.
@@ -16,12 +16,10 @@
1616

1717
set -eu -o pipefail
1818

19-
if ! command -v ltag; then
20-
>&2 echo "ERROR: ltag not found. Install with:"
21-
>&2 echo " go get -u github.com/kunalkushwaha/ltag"
19+
if ! command -v addlicense; then
20+
>&2 echo "ERROR: addlicense not found. Install with:"
21+
>&2 echo " go install github.com/google/addlicense@latest"
2222
exit 1
2323
fi
2424

25-
BASEPATH="${1-}"
26-
27-
ltag -t "${BASEPATH}scripts/validate/template" -excludes "validate testdata resolvepath" --check -v
25+
find . -regex '.*\.sh' -o -regex '.*\.go' -o -regex '.*Makefile' -o -regex '.*Dockerfile' | xargs addlicense -check -l apache -c 'Docker Compose CLI authors' -ignore validate -ignore testdata -ignore resolvepath -v 1>&2

scripts/validate/template/bash.txt

Lines changed: 0 additions & 13 deletions
This file was deleted.

scripts/validate/template/dockerfile.txt

Lines changed: 0 additions & 13 deletions
This file was deleted.

scripts/validate/template/go.txt

Lines changed: 0 additions & 16 deletions
This file was deleted.

scripts/validate/template/makefile.txt

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)