From fe30ce89c631fd4fd5f0441d11087999a1742697 Mon Sep 17 00:00:00 2001 From: Mischan Toosarani-Hausberger Date: Mon, 17 Oct 2022 10:46:42 +0200 Subject: [PATCH 1/3] fix: define a timeout android sim start It happens regularly that the android simulator doesn't start (for whatever reason). But by default, that obsolete step runs until the default job timeout of 360 minutes is reached. When starting successfully, this job step never reaches 6 minutes, so 10 minutes should give it more than enough time (and would still be within the bounds of our typical CI run end-to-end of ~15 mins). --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6b1b90416..bbf88890c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -145,6 +145,7 @@ jobs: - name: Starting Android Simulator if: ${{ env['ANDROID_API'] }} run: bash scripts/start-android.sh + timeout-minutes: 10 - name: Test shell: bash From 53818bc6c9ec7135fe12c6ce5d7e0599a51e5bbe Mon Sep 17 00:00:00 2001 From: Mischan Toosarani-Hausberger Date: Mon, 17 Oct 2022 10:52:45 +0200 Subject: [PATCH 2/3] Update change-log --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85958ec8c..aec90d995 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Updated libunwindstack-ndk submodule to 2022-09-16 ([#759](https://github.com/getsentry/sentry-native/pull/759)) - Updated Breakpad and Crashpad backends to 2022-09-14. ([#735](https://github.com/getsentry/sentry-native/pull/735)) - Be more defensive around transactions ([#757](https://github.com/getsentry/sentry-native/pull/757)) +- Added a CI timeout for the Android simulator start. ([#764]https://github.com/getsentry/sentry-native/pull/764)) ## 0.5.0 From 6b2020b222dc469402aeeee5fe761093152f09ac Mon Sep 17 00:00:00 2001 From: Mischan Toosarani-Hausberger Date: Mon, 17 Oct 2022 10:53:24 +0200 Subject: [PATCH 3/3] fix change-log typo --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aec90d995..d6aa63ea5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ - Updated libunwindstack-ndk submodule to 2022-09-16 ([#759](https://github.com/getsentry/sentry-native/pull/759)) - Updated Breakpad and Crashpad backends to 2022-09-14. ([#735](https://github.com/getsentry/sentry-native/pull/735)) - Be more defensive around transactions ([#757](https://github.com/getsentry/sentry-native/pull/757)) -- Added a CI timeout for the Android simulator start. ([#764]https://github.com/getsentry/sentry-native/pull/764)) +- Added a CI timeout for the Android simulator start. ([#764](https://github.com/getsentry/sentry-native/pull/764)) ## 0.5.0