The bill provides $772.5 billion for discretionary programs and $858 billion in defense funding. It now goes to President Joe Biden to be signed into law.
Griner was arrested in February after Russian authorities found vape canisters containing cannabis oil in her luggage.