add directory check.
Merge branch 'feature-build-matrix'