Senate gets deal for quick vote on funding, Ukraine aid