Skip to content

Commit

Permalink
Change license check packages (kubernetes#4783)
Browse files Browse the repository at this point in the history
Use license-check-and-add instead gulp-header-license and gulp-license-check.
  • Loading branch information
shu-mutou authored and k8s-ci-robot committed Jan 15, 2020
1 parent d3a5a6b commit 686e3f1
Show file tree
Hide file tree
Showing 14 changed files with 1,182 additions and 1,094 deletions.
2 changes: 1 addition & 1 deletion aio/develop/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2019 The Kubernetes Authors.
# Copyright 2017 The Kubernetes Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
3 changes: 1 addition & 2 deletions aio/develop/gosu-command.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/bin/bash

# Copyright 2019 The Kubernetes Authors.
# Copyright 2017 The Kubernetes Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
3 changes: 1 addition & 2 deletions aio/develop/npm-command.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/bin/bash

# Copyright 2019 The Kubernetes Authors.
# Copyright 2017 The Kubernetes Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
3 changes: 1 addition & 2 deletions aio/develop/run-npm-on-container.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/bin/bash

# Copyright 2019 The Kubernetes Authors.
# Copyright 2017 The Kubernetes Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
113 changes: 0 additions & 113 deletions aio/gulp/check.js

This file was deleted.

14 changes: 14 additions & 0 deletions aio/karma-test-shim.js
Original file line number Diff line number Diff line change
@@ -1 +1,15 @@
// Copyright 2017 The Kubernetes Authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

jasmine.DEFAULT_TIMEOUT_INTERVAL = 15000;
13 changes: 13 additions & 0 deletions aio/scripts/license-header.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Copyright 2017 The Kubernetes Authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
2 changes: 1 addition & 1 deletion aio/scripts/pre-commit-i18n.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
# Copyright 2019 The Kubernetes Authors.
# Copyright 2017 The Kubernetes Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion aio/scripts/xliffmerge.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
# Copyright 2019 The Kubernetes Authors.
# Copyright 2017 The Kubernetes Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
3 changes: 1 addition & 2 deletions docs/developer/code-conventions.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ We use following tools and settings for each check and formatting:
| scss | [sass-lint](https://github.com/sasstools/sass-lint) | [`.scss-lint.yml`](../../.scss-lint.yml) |
| scss | [scssfmt](https://github.com/morishitter/scssfmt) | - |
| html | [js-beautify](https://github.com/beautify-web/js-beautify) | options in [`format.sh`](../../aio/scripts/format.sh) |
| license | [gulp-licence-check](https://github.com/magemello/gulp-license-check) | [`header.txt`](aio/templates/header.txt) and [`header_html.txt`](aio/templates/header_html.txt) |
| license | [gulp-header-licence](https://github.com/Vanessa219/gulp-header-license) | [`header.txt`](aio/templates/header.txt) and [`header_html.txt`](aio/templates/header_html.txt) |
| license | [licence-check-and-add](https://github.com/awjh/license-check-and-add) | [`license-checker-config.json`](../../license-checker-config.json) and [`license-header.txt`](aio/scripts/license-header.txt) |
| i18n | [xi18n](https://angular.io/cli/xi18n) | - |
| i18n | [xliffmerge](https://github.com/martinroob/ngx-i18nsupport) | `xliffmergeOptions` in [`package.json`](../../package.json) |

Expand Down
1 change: 0 additions & 1 deletion gulpfile.babel.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Root configuration of the gulp.js build system, loads child modules which define specific tasks.
// Read more at: https://gulpjs.com/

import './aio/gulp/check';
import './aio/gulp/backend';
import './aio/gulp/serve';
import './aio/gulp/deploy';
26 changes: 26 additions & 0 deletions license-checker-config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"ignore": [
"*", "docs", "i18n",
".cached_tools", ".git", ".github", ".tmp", "coverage", "cypress",
"aio/test-resources",
"**/*.json", "**/*.svg", "**/*.txt"
],
"license": "aio/scripts/license-header.txt",
"defaultFormat": {
"eachLine": {
"prepend": "# "
}
},
"licenseFormats": {
"go|ts|js|scss": {
"eachLine": {
"prepend": "// "
}
},
"html": {
"prepend": "<!--",
"append": "-->"
}
},
"trailingWhitespace": "TRIM"
}
Loading

0 comments on commit 686e3f1

Please sign in to comment.