Make/fix CI setup

This repository is occasionally merged with upstream and has apparently changes to upstream (see #1 (closed)) so should be tested.