Add build-type "matrix"