From 35bdfd21c1f13ee43b4aaffd8dc9608255d198ae Mon Sep 17 00:00:00 2001 From: arya2 Date: Thu, 28 Sep 2023 21:32:39 -0400 Subject: [PATCH] Applies suggestions from code review --- .../workflows/continous-integration-docker.patch.yml | 4 ++-- .github/workflows/continous-integration-docker.yml | 10 +++++----- zebra-utils/README.md | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/continous-integration-docker.patch.yml b/.github/workflows/continous-integration-docker.patch.yml index 2e1bad0013d..4b9755519a7 100644 --- a/.github/workflows/continous-integration-docker.patch.yml +++ b/.github/workflows/continous-integration-docker.patch.yml @@ -93,8 +93,8 @@ jobs: steps: - run: 'echo "No build required"' - gen-checkpoints-mainnet: - name: Generate checkpoints mainnet / Run gen-checkpoints-mainnet test + checkpoints-mainnet: + name: Generate checkpoints mainnet / Run checkpoints-mainnet test runs-on: ubuntu-latest steps: - run: 'echo "No build required"' diff --git a/.github/workflows/continous-integration-docker.yml b/.github/workflows/continous-integration-docker.yml index bb74ccbf507..05be19b9fae 100644 --- a/.github/workflows/continous-integration-docker.yml +++ b/.github/workflows/continous-integration-docker.yml @@ -470,14 +470,14 @@ jobs: # # If the state version has changed, waits for the new cached state to be created. # Otherwise, if the state rebuild was skipped, runs immediately after the build job. - gen-checkpoints-mainnet: + checkpoints-mainnet: name: Generate checkpoints mainnet needs: [ test-full-sync, get-available-disks ] uses: ./.github/workflows/deploy-gcp-tests.yml if: ${{ !cancelled() && !failure() && (fromJSON(needs.get-available-disks.outputs.zebra_tip_disk) || needs.test-full-sync.result == 'success') && github.event.inputs.regenerate-disks != 'true' && github.event.inputs.run-full-sync != 'true' && github.event.inputs.run-lwd-sync != 'true' }} with: app_name: zebrad - test_id: gen-checkpoints-mainnet + test_id: checkpoints-mainnet test_description: Generate Zebra checkpoints on mainnet # TODO: update the test to use {{ input.network }} instead? test_variables: '-e NETWORK=Mainnet -e GENERATE_CHECKPOINTS_MAINNET=1 -e ZEBRA_FORCE_USE_COLOR=1 -e ZEBRA_CACHED_STATE_DIR=/var/cache/zebrad-cache' @@ -551,14 +551,14 @@ jobs: # # If the state version has changed, waits for the new cached state to be created. # Otherwise, if the state rebuild was skipped, runs immediately after the build job. - gen-checkpoints-testnet: + checkpoints-testnet: name: Generate checkpoints testnet needs: [ test-full-sync-testnet, get-available-disks-testnet ] uses: ./.github/workflows/deploy-gcp-tests.yml if: ${{ !cancelled() && !failure() && (fromJSON(needs.get-available-disks-testnet.outputs.zebra_tip_disk) || needs.test-full-sync-testnet.result == 'success') && github.event.inputs.regenerate-disks != 'true' && github.event.inputs.run-full-sync != 'true' && github.event.inputs.run-lwd-sync != 'true' }} with: app_name: zebrad - test_id: gen-checkpoints-testnet + test_id: checkpoints-testnet test_description: Generate Zebra checkpoints on testnet test_variables: '-e NETWORK=Testnet -e GENERATE_CHECKPOINTS_TESTNET=1 -e ZEBRA_FORCE_USE_COLOR=1 -e ZEBRA_CACHED_STATE_DIR=/var/cache/zebrad-cache' network: "Testnet" @@ -789,7 +789,7 @@ jobs: # # This list is for reliable tests that are run on the `main` branch. # Testnet jobs are not in this list, because we expect testnet to fail occasionally. - needs: [ regenerate-stateful-disks, test-full-sync, lightwalletd-full-sync, test-all, test-all-getblocktemplate-rpcs, test-fake-activation-heights, test-empty-sync, test-lightwalletd-integration, test-configuration-file, test-zebra-conf-path, test-stateful-sync, test-update-sync, gen-checkpoints-mainnet, lightwalletd-update-sync, lightwalletd-rpc-test, lightwalletd-transactions-test, lightwalletd-grpc-test, get-block-template-test, submit-block-test ] + needs: [ regenerate-stateful-disks, test-full-sync, lightwalletd-full-sync, test-all, test-all-getblocktemplate-rpcs, test-fake-activation-heights, test-empty-sync, test-lightwalletd-integration, test-configuration-file, test-zebra-conf-path, test-stateful-sync, test-update-sync, checkpoints-mainnet, lightwalletd-update-sync, lightwalletd-rpc-test, lightwalletd-transactions-test, lightwalletd-grpc-test, get-block-template-test, submit-block-test ] # Only open tickets for failed scheduled jobs, manual workflow runs, or `main` branch merges. # (PR statuses are already reported in the PR jobs list, and checked by Mergify.) # TODO: if a job times out, we want to create a ticket. Does failure() do that? Or do we need cancelled()? diff --git a/zebra-utils/README.md b/zebra-utils/README.md index af5adbe53ac..80aed60aae1 100644 --- a/zebra-utils/README.md +++ b/zebra-utils/README.md @@ -28,7 +28,7 @@ To find the latest checkpoints on the `main` branch: `Run gen-checkpoints-mainnet` job, in the `Generate checkpoints mainnet` job 3. Scroll down until you see the list of checkpoints, it should start around line 200 4. Add those checkpoints to the end of `zebra-consensus/src/checkpoint/main-checkpoints.txt` -5. Repeat steps 2 to 4 for `testnet` +5. Repeat steps 2 to 4 for `Generate checkpoints testnet` 6. Open a pull request at https://github.com/ZcashFoundation/zebra/pulls #### Manual Checkpoint Generation