diff --git a/.github/actions/compilers/entrypoint.sh b/.github/actions/compilers/entrypoint.sh index 5cb0538cd8..bd1f7ad051 100755 --- a/.github/actions/compilers/entrypoint.sh +++ b/.github/actions/compilers/entrypoint.sh @@ -85,14 +85,7 @@ setup_launchable() { export LAUNCHABLE_SESSION_DIR=${builddir} local github_ref="${GITHUB_REF//\//_}" local build_name="${github_ref}"_"${GITHUB_PR_HEAD_SHA}" - btest_report_path='launchable_bootstraptest.json' - test_report_path='launchable_test_all.json' - test_spec_report_path='launchable_test_spec_report' - test_all_session_file='launchable_test_all_session.txt' - btest_session_file='launchable_btest_session.txt' - test_spec_session_file='launchable_test_spec_session.txt' btests+=--launchable-test-reports="${btest_report_path}" - echo "::group::Setup Launchable" launchable record build --name "${build_name}" || true launchable record session \ --build "${build_name}" \ @@ -135,8 +128,6 @@ setup_launchable() { > "${builddir}"/${test_spec_session_file} \ || true fi - echo "::endgroup::" - trap launchable_record_test EXIT } launchable_record_test() { pushd "${builddir}" @@ -147,10 +138,19 @@ launchable_record_test() { fi } if [ "$LAUNCHABLE_ENABLED" = "true" ]; then + echo "::group::Setup Launchable" + btest_report_path='launchable_bootstraptest.json' + test_report_path='launchable_test_all.json' + test_spec_report_path='launchable_test_spec_report' + test_all_session_file='launchable_test_all_session.txt' + btest_session_file='launchable_btest_session.txt' + test_spec_session_file='launchable_test_spec_session.txt' setup_launchable & setup_pid=$! (sleep 180; kill "$setup_pid" 2> /dev/null) & sleep_pid=$! wait -f "$setup_pid" kill "$sleep_pid" 2> /dev/null + echo "::endgroup::" + trap launchable_record_test EXIT fi pushd ${builddir}