Collapse looks for yaml files that start with "@" for specialCase

CircleCI-Public · Jun 22, 2018 · 31d367d · 31d367d
1 parent 34d83e1
commit 31d367d
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 1 deletion.
diff --git a/...hugo-collapse/.circleci/orbs/hugo/orb.yml → ...ugo-collapse/.circleci/orbs/hugo/@orb.yml b/...hugo-collapse/.circleci/orbs/hugo/orb.yml → ...ugo-collapse/.circleci/orbs/hugo/@orb.yml
diff --git a/cmd/testdata/myorb/test/orb.yml → cmd/testdata/myorb/test/@orb.yml b/cmd/testdata/myorb/test/orb.yml → cmd/testdata/myorb/test/@orb.yml
diff --git a/...-local-commands-etc/test/orbs/foo/orb.yml → ...local-commands-etc/test/orbs/foo/@orb.yml b/...-local-commands-etc/test/orbs/foo/orb.yml → ...local-commands-etc/test/orbs/foo/@orb.yml
diff --git a/...ge-nested-rails-orb/test/orbs/foo/orb.yml → ...e-nested-rails-orb/test/orbs/foo/@orb.yml b/...ge-nested-rails-orb/test/orbs/foo/orb.yml → ...e-nested-rails-orb/test/orbs/foo/@orb.yml
diff --git a/...-nested-rails-orb/test/orbs/rails/orb.yml → ...nested-rails-orb/test/orbs/rails/@orb.yml b/...-nested-rails-orb/test/orbs/rails/orb.yml → ...nested-rails-orb/test/orbs/rails/@orb.yml
diff --git a/filetree/filetree.go b/filetree/filetree.go
@@ -60,7 +60,7 @@ func (n Node) rootFile() bool {
 }
 
 func (n Node) specialCase() bool {
-	re := regexp.MustCompile(`orb\.(yml|yaml)$`)
+	re := regexp.MustCompile(`^@.*\.(yml|yaml)$`)
 	return re.MatchString(n.basename())
 }