Merge branch 'master' into more-docs

Earthfile

@@ -0,0 +1,7 @@
+VERSION 0.8
+
+# This target exists solely for validating the root Earthfile is scanned
+test:
+    FROM ubuntu:latest
+
+    RUN echo "Testing"

cli/cmd/testdata/scan/3.txt

@@ -7,9 +7,9 @@ exec forge --ci scan --earthfile .
 cmp stdout golden_ci.txt
 
 -- golden.txt --
-{"./dir1":["foo","bar"],"./dir1/dir2":["foo","bar"],"./dir3/dir4/dir5":["foo"]}
+{".":["foo","bar"],"./dir1":["foo","bar"],"./dir1/dir2":["foo","bar"],"./dir3/dir4/dir5":["foo"]}
 -- golden_ci.txt --
-["./dir1+bar","./dir1+foo","./dir1/dir2+bar","./dir1/dir2+foo","./dir3/dir4/dir5+foo"]
+[".+bar",".+foo","./dir1+bar","./dir1+foo","./dir1/dir2+bar","./dir1/dir2+foo","./dir3/dir4/dir5+foo"]
 -- blueprint.cue --
 version: "1.0"
 -- Earthfile --

lib/project/project/loader.go

@@ -61,30 +61,6 @@ func (p *DefaultProjectLoader) Load(projectPath string) (Project, error) {
 		return Project{}, fmt.Errorf("failed to load blueprint: %w", err)
 	}
 
-	if !rbp.Get("project").Exists() {
-		p.logger.Debug("No project config found in blueprint, assuming root config")
-		bp, err := validateAndDecode(rbp)
-		if err != nil {
-			p.logger.Error("Failed loading blueprint", "error", err)
-			return Project{}, fmt.Errorf("failed loading blueprint: %w", err)
-		}
-
-		return Project{
-			Blueprint:    bp,
-			Path:         projectPath,
-			RawBlueprint: rbp,
-			Repo:         repo,
-			RepoRoot:     gitRoot,
-			logger:       p.logger,
-			ctx:          p.ctx,
-		}, nil
-	}
-
-	var name string
-	if err := rbp.DecodePath("project.name", &name); err != nil {
-		return Project{}, fmt.Errorf("failed to get project name: %w", err)
-	}
-
 	efPath := filepath.Join(projectPath, "Earthfile")
 	exists, err := afero.Exists(p.fs, efPath)
 	if err != nil {
@@ -109,6 +85,31 @@ func (p *DefaultProjectLoader) Load(projectPath string) (Project, error) {
 		ef = &efs
 	}
 
+	if !rbp.Get("project").Exists() {
+		p.logger.Debug("No project config found in blueprint, assuming root config")
+		bp, err := validateAndDecode(rbp)
+		if err != nil {
+			p.logger.Error("Failed loading blueprint", "error", err)
+			return Project{}, fmt.Errorf("failed loading blueprint: %w", err)
+		}
+
+		return Project{
+			Blueprint:    bp,
+			Earthfile:    ef,
+			Path:         projectPath,
+			RawBlueprint: rbp,
+			Repo:         repo,
+			RepoRoot:     gitRoot,
+			logger:       p.logger,
+			ctx:          p.ctx,
+		}, nil
+	}
+
+	var name string
+	if err := rbp.DecodePath("project.name", &name); err != nil {
+		return Project{}, fmt.Errorf("failed to get project name: %w", err)
+	}
+
 	p.logger.Info("Loading tag data")
 	var tag *ProjectTag
 	gitTag, err := git.GetTag(repo)