Construct build matrix correctly

Fold `include` under `matrix`, and add the default postgresql
version, since the default job is now lost in the build matrix.

Hiro Asari authored and committed

Nothing here #595.2 passed

  • Ran for
AMD64
no language set
Git