Display the merge commit as the version of the seed.

brave · Aug 8, 2024 · 3551a34 · 3551a34
1 parent 7a0c55b
commit 3551a34
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git 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)

diff --git a/seed/seed.json b/seed/seed.json
@@ -30,7 +30,7 @@
                     "NIGHTLY",
                     "BETA"
                 ],
-                "min_version": "92.1.30.57",
+                "min_version": "92.1.30.58",
                 "platform": [
                     "WINDOWS",
                     "MAC",