Skip to content

Commit c807b9b

Browse files
authored
Let 'all' be the default make target and include 'generate'. (#2266)
1 parent b171718 commit c807b9b

File tree

4 files changed

+36
-6
lines changed

4 files changed

+36
-6
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# Copyright 2021 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
blank_issues_enabled: true
216
contact_links:
317
- name: kpt Documentation

.github/workflows/firebase-hosting-merge.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# Copyright 2021 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
# This file was initially auto-generated by the Firebase CLI
216
# https://github.com/firebase/firebase-tools
317

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ GOBIN := $(shell go env GOPATH)/bin
2424
# By default, make test-fn-render/test-fn-eval will run all tests.
2525
T ?= ".*"
2626

27+
all: generate license fix vet fmt lint test build buildall tidy
28+
2729
build:
2830
go build -o $(GOBIN)/kpt -v .
2931

30-
all: license fix vet fmt lint test build buildall tidy
31-
3232
buildall:
3333
GOOS=windows go build -o /dev/null
3434
GOOS=linux go build -o /dev/null

scripts/update-license.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
# don't add licenses to the site directory, it will break the docs
1616
# and will add them to the theme which is a submodule (bad)
1717
which addlicense || go get github.com/google/addlicense
18-
ls | grep -v site | grep -v docs | grep -v e2e | xargs $GOBIN/addlicense -y 2021 -l apache
19-
# process e2e separately because expected result files shouldn't have license
20-
# otherwise the test will fail
21-
find e2e -type f | grep -v '.expected/results.yaml' | xargs $GOBIN/addlicense -y 2021 -l apache
18+
find . -type f \
19+
! -path "./site/*" \
20+
! -path "./docs/*" \
21+
! -path "**/.expected/results.yaml" \
22+
! -path "**/generated/*" \
23+
| xargs $GOBIN/addlicense -y 2021 -l apache

0 commit comments

Comments
 (0)