fix(dagger): provide the .golangci.yaml via +defaultPath annotation. …

…No need to copy it anymore.
go-orb · Sep 5, 2024 · 35e47da · 35e47da
1 parent fd8f68a
commit 35e47da
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 262 deletions.
diff --git a/.github/.golangci.yaml b/.github/.golangci.yaml
diff --git a/.github/main.go b/.github/main.go
@@ -111,7 +111,12 @@ func (m *GoOrb) Modules(ctx context.Context, root *dagger.Directory) ([]string,
 }
 
 // Lints all modules starting from `root` with golangci-lint
-func (m *GoOrb) Lint(ctx context.Context, root *dagger.Directory) (*AllResult, error) {
+func (m *GoOrb) Lint(
+	ctx context.Context,
+	root *dagger.Directory,
+	// +defaultPath="/.golangci.yaml"
+	golangciConfig *dagger.File,
+) (*AllResult, error) {
 	lintWorker := func(ctx context.Context, wg *sync.WaitGroup, input <-chan string, res chan<- *WorkerResult, root *dagger.Directory) {
 		defer wg.Done()
 		for dir := range input {
@@ -121,8 +126,6 @@ func (m *GoOrb) Lint(ctx context.Context, root *dagger.Directory) (*AllResult, e
 			default:
 			}
 
-			config := dag.CurrentModule().Source().File(".golangci.yaml")
-
 			out, err := dag.Container().From("golangci/golangci-lint").
 				WithMountedCache("/go/pkg/mod",
 					dag.CacheVolume("go-mod"),
@@ -141,7 +144,7 @@ func (m *GoOrb) Lint(ctx context.Context, root *dagger.Directory) (*AllResult, e
 				WithMountedCache("/root/.cache/golangci-lint", dag.CacheVolume("golangci-lint")).
 				WithDirectory("/work/src", root.Directory(dir)).
 				WithWorkdir("/work/src").
-				WithMountedFile("/work/config", config).
+				WithMountedFile("/work/config", golangciConfig).
 				WithExec([]string{"golangci-lint", "run", "--config", "/work/config"}).
 				Stdout(ctx)