From fa10aa7cd85a33951e591166edf121192cea5cf6 Mon Sep 17 00:00:00 2001 From: Kazumichi Yamamoto Date: Tue, 5 Mar 2024 10:06:20 +0900 Subject: [PATCH 1/2] Squashed 'includes/' changes from 05494da..da19115 da19115 v0.0.8 20008ba golangci-lint v1.56.2 (#12) 0bab2ce golangci-lint v1.55.2 (#11) bd171b2 golangci-lint v1.51.2 (#10) b09c34a golangci-lint v1.50.1 (#9) 8d0e6bb copyright: 2023 (#8) git-subtree-dir: includes git-subtree-split: da19115f0259f5b8f3b96fbfbca1fca6ecc86011 --- README.md | 6 +++--- go/common.mk | 6 +++--- go/single.mk | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index a3e570b..99c4aea 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ git remote add makefile https://github.com/sacloud/makefile.git #### 追加(初回のみ) ```bash -git subtree add --prefix=includes --squash makefile v0.0.7 +git subtree add --prefix=includes --squash makefile v0.0.8 ``` 利用する側のプロジェクトではMakefileを以下のように記述します。 @@ -41,12 +41,12 @@ tools: dev-tools # toolsゴールはsacloudプロダクト向け日次CIを行 #### 更新 ```bash -git subtree pull --prefix=includes --squash makefile v0.0.7 +git subtree pull --prefix=includes --squash makefile v0.0.8 ``` ## License -`sacloud/makefile` Copyright (C) 2022 The sacloud/makefile Authors. +`sacloud/makefile` Copyright (C) 2022-2023 The sacloud/makefile Authors. This project is published under [Apache 2.0 License](LICENSE). diff --git a/go/common.mk b/go/common.mk index 3ad7a57..fe207c6 100644 --- a/go/common.mk +++ b/go/common.mk @@ -1,5 +1,5 @@ # -# Copyright 2022 The sacloud/makefile Authors +# Copyright 2022-2023 The sacloud/makefile Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,11 +15,11 @@ # AUTHOR ?= The sacloud/makefile Authors -COPYRIGHT_YEAR ?= 2022 +COPYRIGHT_YEAR ?= 2023 COPYRIGHT_FILES ?= $$(find . -name "*.go" -print | grep -v "/vendor/") GO ?= go DEFAULT_GOALS ?= fmt set-license go-licenses-check goimports lint test -GOLANG_CI_LINT_VERSION ?= v1.49.0 +GOLANG_CI_LINT_VERSION ?= v1.56.2 TEXTLINT_ACTION_VERSION ?= v0.0.3 .DEFAULT_GOAL = default diff --git a/go/single.mk b/go/single.mk index 9afdf37..8638ddd 100644 --- a/go/single.mk +++ b/go/single.mk @@ -1,5 +1,5 @@ # -# Copyright 2022 The sacloud/makefile Authors +# Copyright 2022-2023 The sacloud/makefile Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. From e6996bb7438de9b5bcbc2827f7f3647e434c8fe2 Mon Sep 17 00:00:00 2001 From: Kazumichi Yamamoto Date: Tue, 5 Mar 2024 10:10:54 +0900 Subject: [PATCH 2/2] ignore depguard --- .golangci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.golangci.yml b/.golangci.yml index e5946c9..e3679a4 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -8,7 +8,6 @@ issues: linters: disable-all: true enable: - - depguard - errcheck - exportloopref - gocritic @@ -29,6 +28,7 @@ linters: # don't enable: # - asciicheck + # - depguard # - dogsled # - dupl # - funlen