Merge pull request #2245 from sammj/ci

ci: Use uname rather than arch