Build and test

Fix conflicts and merge master into this branch #1567

Sign in to view logs

Run time

Learn about OS pricing on GitHub Actions

Job	Run time
Skip Check	4s
Instrumentation tests	11m 50s
Build	1h 20m 35s
	1h 32m 29s