Merge pull request #3949 from libgit2/ethomson/v24-updates

Some CI fixes for the maint/v0.24 branch