From 4c2ba837679dd8b4315b60dfb3546dbb418da9e5 Mon Sep 17 00:00:00 2001 From: hlts2 Date: Thu, 8 Feb 2024 17:38:39 +0900 Subject: [PATCH 1/4] fix: refactor ignore rule Signed-off-by: hlts2 --- .github/workflows/_docker-image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/_docker-image.yaml b/.github/workflows/_docker-image.yaml index 2f37579b7d..0357f8c653 100644 --- a/.github/workflows/_docker-image.yaml +++ b/.github/workflows/_docker-image.yaml @@ -1,4 +1,3 @@ -# !yamlfmt!:ignore # # Copyright (C) 2019-2024 vdaas.org vald team # @@ -14,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# !yamlfmt!:ignore name: "Build docker image" on: workflow_call: From 99cdf4774f63b7d3e05b517f106e6bbd11ec1027 Mon Sep 17 00:00:00 2001 From: hlts2 Date: Thu, 8 Feb 2024 17:44:52 +0900 Subject: [PATCH 2/4] fix: ignore rule to hack license gen command Signed-off-by: hlts2 --- .github/workflows/_docker-image.yaml | 1 + hack/license/gen/main.go | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/_docker-image.yaml b/.github/workflows/_docker-image.yaml index 0357f8c653..21331f9d50 100644 --- a/.github/workflows/_docker-image.yaml +++ b/.github/workflows/_docker-image.yaml @@ -1,3 +1,4 @@ +# !yamlfmt!:ignore # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/hack/license/gen/main.go b/hack/license/gen/main.go index a17f258b66..68f28a86d0 100644 --- a/hack/license/gen/main.go +++ b/hack/license/gen/main.go @@ -309,7 +309,9 @@ func readAndRewrite(path string) error { line := sc.Text() if filepath.Ext(path) == ".go" && strings.HasPrefix(line, "//go:") || filepath.Ext(path) == ".py" && strings.HasPrefix(line, "# -*-") || - filepath.Ext(path) == ".sh" && strings.HasPrefix(line, "#!") { + filepath.Ext(path) == ".sh" && strings.HasPrefix(line, "#!") || + filepath.Ext(path) == ".yaml" && strings.HasPrefix(line, "# !") || + filepath.Ext(path) == ".yml" && strings.HasPrefix(line, "# !") { bf = true _, err = buf.WriteString(line) if err != nil { From a08c01b45e1393680b67d30eff3317b7f698b1aa Mon Sep 17 00:00:00 2001 From: hlts2 Date: Thu, 8 Feb 2024 17:46:26 +0900 Subject: [PATCH 3/4] fix: deleted unnecessary rule Signed-off-by: hlts2 --- .github/workflows/_docker-image.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/_docker-image.yaml b/.github/workflows/_docker-image.yaml index 21331f9d50..2f37579b7d 100644 --- a/.github/workflows/_docker-image.yaml +++ b/.github/workflows/_docker-image.yaml @@ -14,7 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# !yamlfmt!:ignore name: "Build docker image" on: workflow_call: From e47b40e7b9f88c48e15d35ede80d727dcb317edd Mon Sep 17 00:00:00 2001 From: hlts2 Date: Thu, 8 Feb 2024 17:48:32 +0900 Subject: [PATCH 4/4] fix: make format Signed-off-by: hlts2 --- .github/workflows/_docker-image.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/_docker-image.yaml b/.github/workflows/_docker-image.yaml index 2f37579b7d..7e600e513b 100644 --- a/.github/workflows/_docker-image.yaml +++ b/.github/workflows/_docker-image.yaml @@ -1,4 +1,5 @@ # !yamlfmt!:ignore + # # Copyright (C) 2019-2024 vdaas.org vald team #