From 7ec96c45f844115d90d50842f31b003aedb5b192 Mon Sep 17 00:00:00 2001 From: Tony Worm Date: Tue, 16 Mar 2021 13:56:35 -0400 Subject: [PATCH 1/5] add missing ops to #Op in stdlib/llb Signed-off-by: Tony Worm --- stdlib/llb/llb.cue | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/stdlib/llb/llb.cue b/stdlib/llb/llb.cue index faead535..fddbe8ff 100644 --- a/stdlib/llb/llb.cue +++ b/stdlib/llb/llb.cue @@ -2,7 +2,18 @@ package llb // One operation in a script -#Op: #FetchContainer | #FetchGit | #Export | #Exec | #Local | #Copy | #Load | #Subdir | #WriteFile | #Mkdir +#Op: #Export | + #FetchContainer | + #PushContainer | + #FetchGit | + #Exec | + #Local | + #Copy | + #Load | + #Subdir | + #WriteFile | + #Mkdir | + #Dockerbuild // Export a value from fs state to cue #Export: { From aebf466b146ac1b332053536aed38407f68a7e11 Mon Sep 17 00:00:00 2001 From: Tony Worm Date: Tue, 16 Mar 2021 15:20:29 -0400 Subject: [PATCH 2/5] cuefmt Signed-off-by: Tony Worm --- stdlib/llb/llb.cue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stdlib/llb/llb.cue b/stdlib/llb/llb.cue index fddbe8ff..3a4c4ff3 100644 --- a/stdlib/llb/llb.cue +++ b/stdlib/llb/llb.cue @@ -6,12 +6,12 @@ package llb #FetchContainer | #PushContainer | #FetchGit | - #Exec | + #Exec | #Local | #Copy | #Load | #Subdir | - #WriteFile | + #WriteFile | #Mkdir | #Dockerbuild From 587e1d2d897e7253bf9e721f0f69762bc1fd4f5a Mon Sep 17 00:00:00 2001 From: Tony Worm Date: Tue, 16 Mar 2021 15:26:39 -0400 Subject: [PATCH 3/5] increase lint action timeout to 3m Signed-off-by: Tony Worm --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8b6209f9..1efdebb3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,6 +48,7 @@ jobs: id: go - name: Lint + timeout-minutes: 3 run: | make lint From 3a9b33f0281abc3a49a6d8b5973ca4c43f2fd409 Mon Sep 17 00:00:00 2001 From: Tony Worm Date: Tue, 16 Mar 2021 15:33:52 -0400 Subject: [PATCH 4/5] move timeout to golangci-lint command Signed-off-by: Tony Worm --- .github/workflows/ci.yml | 1 - Makefile | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1efdebb3..8b6209f9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,7 +48,6 @@ jobs: id: go - name: Lint - timeout-minutes: 3 run: | make lint diff --git a/Makefile b/Makefile index 839f1019..c9ed0754 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ cuefmt: .PHONY: lint lint: cuefmt check-buildkit-version - golangci-lint run + golangci-lint run --timeout 3m @test -z "$$(git status -s . | grep -e "^ M" | grep .cue | cut -d ' ' -f3 | tee /dev/stderr)" .PHONY: check-buildkit-version From 13198f85604d28f1b97d3603cf90ff4ba8f1ac3b Mon Sep 17 00:00:00 2001 From: Tony Worm Date: Tue, 16 Mar 2021 16:59:32 -0400 Subject: [PATCH 5/5] fix TitleCase error Signed-off-by: Tony Worm --- stdlib/llb/llb.cue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/llb/llb.cue b/stdlib/llb/llb.cue index 3a4c4ff3..fa20b071 100644 --- a/stdlib/llb/llb.cue +++ b/stdlib/llb/llb.cue @@ -13,7 +13,7 @@ package llb #Subdir | #WriteFile | #Mkdir | - #Dockerbuild + #DockerBuild // Export a value from fs state to cue #Export: {