Skip to content

Commit

Permalink
Merge commit '47b60104b9f78fc79ce8a791cf62174a7dbb97ea' into sacloud/…
Browse files Browse the repository at this point in the history
…makefile
  • Loading branch information
yamamoto-febc committed Oct 3, 2022
2 parents 2d2a8ca + 47b6010 commit 7a3a4fe
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions includes/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ git remote add makefile https://github.com/sacloud/makefile.git
#### 追加(初回のみ)

```bash
git subtree add --prefix=includes --squash makefile v0.0.6
git subtree add --prefix=includes --squash makefile v0.0.7
```

利用する側のプロジェクトではMakefileを以下のように記述します。
Expand All @@ -41,7 +41,7 @@ tools: dev-tools # toolsゴールはsacloudプロダクト向け日次CIを行
#### 更新

```bash
git subtree pull --prefix=includes --squash makefile v0.0.6
git subtree pull --prefix=includes --squash makefile v0.0.7
```

## License
Expand Down
2 changes: 1 addition & 1 deletion includes/go/common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ COPYRIGHT_YEAR ?= 2022
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.46.2
GOLANG_CI_LINT_VERSION ?= v1.49.0
TEXTLINT_ACTION_VERSION ?= v0.0.3

.DEFAULT_GOAL = default
Expand Down

0 comments on commit 7a3a4fe

Please sign in to comment.