Merge remote-tracking branch 'origin/main' into issue5452

ZcashFoundation · Nov 8, 2022 · 100daa2 · 100daa2
2 parents cb2753f + f77d750
commit 100daa2
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 152 deletions.
diff --git a/.github/workflows/continous-integration-docker.yml b/.github/workflows/continous-integration-docker.yml
@@ -332,7 +332,7 @@ jobs:
     # because we might never get a finished sync.
     #
     # See the concurrency comment on the zebrad test-full-sync job for details.
-    concurrency: 
+    concurrency:
       group: ${{ github.workflow }}−${{ github.ref }}-regenerate-stateful-disks
       cancel-in-progress: false
 
@@ -378,22 +378,24 @@ jobs:
       test_id: full-sync-to-tip
       test_description: Test a full sync up to the tip
       test_variables: '-e TEST_FULL_SYNC=1 -e ZEBRA_FORCE_USE_COLOR=1 -e FULL_SYNC_MAINNET_TIMEOUT_MINUTES=600'
+      # This test runs for longer than 6 hours, so it needs multiple jobs
+      is_long_test: true
       needs_zebra_state: false
       saves_to_disk: true
       disk_suffix: tip
       height_grep_text: 'current_height.*=.*Height.*\('
     # We want to prevent multiple full zebrad syncs running at the same time,
     # but we don't want to cancel running syncs on `main` if a new PR gets merged,
     # because we might never get a finished sync.
-    # 
+    #
     # Instead, we let the first sync complete, then queue the latest pending sync, cancelling any syncs in between.
     # (As the general workflow concurrency group just gets matched in Pull Requests,
     # it has no impact on this job.)
     #
     # TODO:
     # - allow multiple manual syncs on a branch, and isolate manual syncs from automatic syncs, by adding '-${{ github.run_id }}' when github.event.inputs.run-full-sync is true
     # - stop multiple automatic full syncs across different PRs by removing '−${{ github.ref }}' when needs.get-available-disks.outputs.zebra_tip_disk is true
-    concurrency: 
+    concurrency:
       group: ${{ github.workflow }}−${{ github.ref }}-test-full-sync
       cancel-in-progress: false
 
@@ -460,7 +462,7 @@ jobs:
     # because we might never get a finished sync.
     #
     # See the concurrency comment on the zebrad test-full-sync job for details.
-    concurrency: 
+    concurrency:
       group: ${{ github.workflow }}−${{ github.ref }}-lightwalletd-full-sync
       cancel-in-progress: false
 
@@ -546,7 +548,7 @@ jobs:
     # because we might never get a finished test.
     #
     # See the concurrency comment on the zebrad test-full-sync job for details.
-    concurrency: 
+    concurrency:
       group: ${{ github.workflow }}−${{ github.ref }}-lightwalletd-transactions-test
       cancel-in-progress: false