search

titzer / virgil

A fast and lightweight native programming language
1.23k stars 44 forks source link

Git conflict markers in tests #227

Closed k-sareen closed 6 months ago

k-sareen commented 6 months ago

Hello! Been a while. Just pulled master today and I saw this commit that seemed to check in the git conflict markers into test files here and here? I presume that was a mistake.

I'm not sure why the test script doesn't die?

titzer commented 6 months ago

Ah, shoot. I had a merge rebase issue and thought I had fixed that. Yeah, somehow the unit tests don't fail the CI; similar issue to parser failures not generating a non-zero exit code. I'll fix the conflict markers in a sec.

k-sareen commented 6 months ago

CI is just piggy-backing off test/all.bash so the underlying issue is likely there.

k-sareen commented 6 months ago

Also https://github.com/titzer/virgil/commit/44bda5f28bb9ebdc998d3fb9da15c8c3171cb8a5 only fixed one file. This file still has the markers checked in.

titzer commented 6 months ago

Going to close this; probably should be a separate issue for the unit tests not failing CI.