I was working/worked

Are both the following sentences grammatical with 'until'?

1- I was working in the garden for two hours until my father cam from the market.

2- I worked in the garden for two hours until my father cam from the market.