From db409183640acc03423bd5c412404e65860224f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <3044353+pwojcikdev@users.noreply.github.com> Date: Wed, 31 Jan 2024 23:25:17 +0100 Subject: [PATCH] Update macOS runner (#4415) * Update macOS runner * Relax `timer.measure_and_compare` timings --- .github/workflows/artifacts_build_deploy.yml | 2 +- .github/workflows/unit_tests.yml | 2 +- nano/core_test/timer.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/artifacts_build_deploy.yml b/.github/workflows/artifacts_build_deploy.yml index 24de26309f..4f67d50e67 100644 --- a/.github/workflows/artifacts_build_deploy.yml +++ b/.github/workflows/artifacts_build_deploy.yml @@ -33,7 +33,7 @@ jobs: osx_job: needs: prepare_build if: ${{ needs.prepare_build.outputs.TAG_CREATED == 'true' }} - runs-on: macOS-12 + runs-on: macOS-14 timeout-minutes: 90 strategy: matrix: diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 6a05626f9f..47fb08abf9 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -16,7 +16,7 @@ jobs: BUILD_TYPE: ${{ matrix.RELEASE && 'RelWithDebInfo' || 'Debug' }} TEST_USE_ROCKSDB: ${{ matrix.BACKEND == 'rocksdb' && '1' || '0' }} DEADLINE_SCALE_FACTOR: ${{ matrix.BACKEND == 'rocksdb' && '2' || '1' }} - runs-on: macos-12 + runs-on: macos-14 if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository steps: - name: Checkout diff --git a/nano/core_test/timer.cpp b/nano/core_test/timer.cpp index cf718f11bd..85b3040739 100644 --- a/nano/core_test/timer.cpp +++ b/nano/core_test/timer.cpp @@ -39,7 +39,7 @@ TEST (timer, measure_and_compare) std::this_thread::sleep_for (50ms); ASSERT_TRUE (t1.after_deadline (30ms)); ASSERT_TRUE (t1.before_deadline (500ms)); - ASSERT_LT (t1.since_start (), 200ms); + ASSERT_LT (t1.since_start (), 500ms); ASSERT_GT (t1.since_start (), 10ms); ASSERT_GE (t1.stop (), 50ms); std::this_thread::sleep_for (50ms);