ability to override watermark

Author: osfameron

lib/preview.js

@@ -18,6 +18,7 @@ module.exports.register = function () {
     const args = {
         repo: process.env.PREVIEW_REPO,
         branch: process.env.PREVIEW_BRANCH || 'HEAD',
+        watermark_branch: process.env.PREVIEW_WATERMARK_BRANCH,
         config: process.env.PREVIEW_CONFIG || process.env.PREVIEW_BRANCH || 'HEAD',
         remote: process.env.PREVIEW_REMOTE ? true : false,
         repoPath: ((process.env.REPO_PATH || '..')
@@ -135,8 +136,9 @@ module.exports.register = function () {
     playbook.content.sources = mappedSources
 
     const date = new Date().toISOString().split('T')[0]
+    const watermark_branch = args.watermark || args.branch
     playbook.asciidoc.attributes['page-watermark'] =
-        `${date} ${args.repo} ${args.branch}`
+        `${date} ${args.repo} ${watermark_branch}`
 
     // console.dir(playbook, {depth: 5}); process.exit(1)
     // reinflate .env before updating
@@ -187,8 +189,6 @@ function getSources(playbook, additionalSources) {
     return Object.fromEntries(sources)
 }
 
-
-
 function overrideArray(_options) {
     return (_arr1, arr2) => arr2
 }
@@ -227,4 +227,4 @@ function spawn(...args) {
             }
         })
     })
-}
+}

scripts/preview

@@ -212,6 +212,9 @@ if [ -n "$REMOTE" ]; then
     assert "$PREVIEW_BRANCH" "$PREVIEW_CONFIG" "Remote preview doesn't support custom --config, will be ignored"
     assert "$DEBUG" "" "Remote preview doesn't support --debug, will be ignored"
 
+    PR_BASE_OID=$(gh pr view --json baseRefOid -q .baseRefOid 2>/dev/null) || true
+    PR_BASE_NAME=$(gh pr view --json baseRefName -q .baseRefName 2>/dev/null) || true
+
     WORKFLOW=preview-deploy.yml
     UUID=$(uuidgen)
 
@@ -220,6 +223,8 @@ if [ -n "$REMOTE" ]; then
         --field preview_branch=${PREVIEW_BRANCH} \
         --field preview_start_path=${PREVIEW_START_PATH} \
         --field preview_override=${PREVIEW_OVERRIDE} \
+        --field pr_base_name=${PR_BASE_NAME} \
+        --field pr_base_oid=${PR_BASE_OID} \
         --field uuid=${UUID} \
         > /dev/null