From c00677218017c551003ca1cea1f2426f128918a6 Mon Sep 17 00:00:00 2001 From: teor Date: Tue, 24 May 2022 13:10:53 +1000 Subject: [PATCH] fix(ci): Make reusable workflow job names match patch job names (#4466) * Add blank names to reusable workflow jobs * Give each job a proper name * Update patch job names * Remove unnecessary quotes --- .../continous-integration-docker.patch.yml | 60 ++++++++++++------- .../continous-integration-docker.yml | 8 +++ 2 files changed, 47 insertions(+), 21 deletions(-) diff --git a/.github/workflows/continous-integration-docker.patch.yml b/.github/workflows/continous-integration-docker.patch.yml index ae3b9975..e6e107ae 100644 --- a/.github/workflows/continous-integration-docker.patch.yml +++ b/.github/workflows/continous-integration-docker.patch.yml @@ -47,7 +47,7 @@ jobs: - run: 'echo "No build required"' build: - name: Build images + name: Build / Build images runs-on: ubuntu-latest steps: - run: 'echo "No build required"' @@ -55,7 +55,6 @@ jobs: test-all: name: Test all runs-on: ubuntu-latest - needs: build steps: - run: 'echo "No build required"' @@ -74,28 +73,47 @@ jobs: test-lightwalletd-integration: name: Test integration with lightwalletd runs-on: ubuntu-latest - needs: build steps: - run: 'echo "No build required"' - # Create a patch job for each call to deploy-gcp-tests.yml - # - # GitHub's branch protection rules only match on the name (they ignore the job ID) - deploy-gcp-tests-patch: - name: Run ${{ matrix.test_id }} test + regenerate-stateful-disks: + name: Zebra checkpoint / Run sync-to-checkpoint test + runs-on: ubuntu-latest + steps: + - run: 'echo "No build required"' + + test-stateful-sync: + name: Zebra checkpoint update / Run sync-past-checkpoint test + runs-on: ubuntu-latest + steps: + - run: 'echo "No build required"' + + test-full-sync: + name: Zebra tip / Run full-sync-to-tip test + runs-on: ubuntu-latest + steps: + - run: 'echo "No build required"' + + lightwalletd-rpc-test: + name: Zebra tip JSON-RPC / Run fully-synced-rpc test + runs-on: ubuntu-latest + steps: + - run: 'echo "No build required"' + + lightwalletd-transactions-test: + name: lightwalletd tip send / Run lwd-send-transactions test + runs-on: ubuntu-latest + steps: + - run: 'echo "No build required"' + + lightwalletd-full-sync: + name: lightwalletd tip / Run lwd-full-sync test + runs-on: ubuntu-latest + steps: + - run: 'echo "No build required"' + + lightwalletd-update-sync: + name: lightwalletd tip update / Run lwd-update-sync test runs-on: ubuntu-latest - strategy: - matrix: - # Keep this list in sync with the test_id inputs to each deploy-gcp-tests.yml call - # in continous-integration-docker.yml - test_id: - - 'sync-to-checkpoint' - - 'sync-past-checkpoint' - - 'full-sync-to-tip' - - 'fully-synced-rpc' - - 'lwd-full-sync' - - 'lwd-update-sync' - - 'lwd-send-transactions' - - 'lwd-grpc-wallet' steps: - run: 'echo "No build required"' diff --git a/.github/workflows/continous-integration-docker.yml b/.github/workflows/continous-integration-docker.yml index 2221579a..1eb1f53f 100644 --- a/.github/workflows/continous-integration-docker.yml +++ b/.github/workflows/continous-integration-docker.yml @@ -134,6 +134,7 @@ jobs: fi build: + name: Build uses: ./.github/workflows/build-docker-image.yml with: dockerfile_path: ./docker/Dockerfile @@ -243,6 +244,7 @@ jobs: # # Note: the output from get-available-disks should match with the caller workflow inputs regenerate-stateful-disks: + name: Zebra checkpoint needs: [ build, get-available-disks ] uses: ./.github/workflows/deploy-gcp-tests.yml if: ${{ !fromJSON(needs.get-available-disks.outputs.zebra_checkpoint_disk) || github.event.inputs.regenerate-disks == 'true' }} @@ -260,6 +262,7 @@ 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. test-stateful-sync: + name: Zebra checkpoint update needs: regenerate-stateful-disks uses: ./.github/workflows/deploy-gcp-tests.yml if: ${{ !cancelled() && !failure() && github.event.inputs.regenerate-disks != 'true' && github.event.inputs.run-full-sync != 'true' }} @@ -281,6 +284,7 @@ jobs: # # Note: the output from get-available-disks should match with the caller workflow inputs test-full-sync: + name: Zebra tip needs: [ build, get-available-disks ] uses: ./.github/workflows/deploy-gcp-tests.yml # to also run on Mergify head branches, @@ -305,6 +309,7 @@ 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. lightwalletd-rpc-test: + name: Zebra tip JSON-RPC needs: test-full-sync uses: ./.github/workflows/deploy-gcp-tests.yml if: ${{ !cancelled() && !failure() && github.event.inputs.regenerate-disks != 'true' && github.event.inputs.run-full-sync != 'true' }} @@ -329,6 +334,7 @@ jobs: # Otherwise, if the state rebuild was skipped, runs immediately after the build job. # TODO: move this job under lightwalletd-full-sync to have a sequential logic lightwalletd-transactions-test: + name: lightwalletd tip send needs: lightwalletd-full-sync uses: ./.github/workflows/deploy-gcp-tests.yml if: ${{ !cancelled() && !failure() && github.event.inputs.regenerate-disks != 'true' && github.event.inputs.run-full-sync != 'true' }} @@ -354,6 +360,7 @@ 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. lightwalletd-full-sync: + name: lightwalletd tip needs: test-full-sync uses: ./.github/workflows/deploy-gcp-tests.yml if: ${{ !cancelled() && !failure() && github.event.inputs.regenerate-disks != 'true' && github.event.inputs.run-full-sync != 'true' }} @@ -379,6 +386,7 @@ jobs: # If the state version has changed, waits for the new cached states to be created. # Otherwise, if the state rebuild was skipped, runs immediately after the build job. lightwalletd-update-sync: + name: lightwalletd tip update needs: lightwalletd-full-sync uses: ./.github/workflows/deploy-gcp-tests.yml if: ${{ !cancelled() && !failure() && github.event.inputs.regenerate-disks != 'true' && github.event.inputs.run-full-sync != 'true' }}