From bd4cee17677b39d88b615e6dcdb72cdda1bdeb71 Mon Sep 17 00:00:00 2001 From: Aleksey Khoroshilov Date: Thu, 8 Aug 2024 23:14:48 +0700 Subject: [PATCH] Display the merge commit as the version of the seed. --- .github/workflows/generate-test-seed.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/generate-test-seed.yml b/.github/workflows/generate-test-seed.yml index 6e88b64e..1dd6d6ac 100644 --- a/.github/workflows/generate-test-seed.yml +++ b/.github/workflows/generate-test-seed.yml @@ -12,8 +12,9 @@ jobs: env: ACTION_RUN_URL: '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}' BASE_SHA: '${{ github.event.pull_request.base.sha }}' + HEAD_SHA: '${{ github.event.pull_request.head.sha }}' REMOTE_SEED_PATH: 'pull/${{ github.event.pull_request.number }}/seed' - SEED_VERSION: 'pull/${{ github.event.pull_request.number }}@${{ github.event.pull_request.head.sha }}' + SEED_VERSION: 'pull/${{ github.event.pull_request.number }}@${{ github.sha }}' steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 @@ -103,10 +104,15 @@ jobs: 3. Restart the browser to apply the seed. 4. Ensure **Active Variations** section at \`brave://version\` starts with the expected seed version (see below). - #### Seed Details - - Version: \`${process.env.SEED_VERSION}\` - - Uploaded: \`${new Date().toISOString()}\` - - Serial Number: \`${serialNumberContent}\` + ### Seed Details + |Parameter|Value| + |--------|--------| + |Version|\`${process.env.SEED_VERSION}\`| + |Uploaded|${new Date().toUTCString()}| + |PR commit|${process.env.HEAD_SHA}| + |Base commit|${process.env.BASE_SHA}| + |Merge commit|${process.env.GITHUB_SHA}| + |Serial number|\`${serialNumberContent}\`| ` const comment = require('.github/workflows/scripts/comment.js') await comment(github, context, commentBody)