From: Angus Gratton <angus@espressif.com>
Date: Mon, 3 Dec 2018 03:39:26 +0000 (+0800)
Subject: Merge branch 'ci/combine_unit_test_and_integration_test' into 'master'
X-Git-Tag: v3.3-beta1~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=80e6def4b8e1f674dae9789e4822cc304aa8e9b5;p=esp-idf

Merge branch 'ci/combine_unit_test_and_integration_test' into 'master'

ci: combine unit_test and integration_test stage

See merge request idf/esp-idf!3792
---

80e6def4b8e1f674dae9789e4822cc304aa8e9b5