Skip to content

Sync with upstream rossjrw/pr-preview-action (84 commits)#133

Closed
npwolf wants to merge 9 commits intorossjrw:mainfrom
datagrail:sync-upstream
Closed

Sync with upstream rossjrw/pr-preview-action (84 commits)#133
npwolf wants to merge 9 commits intorossjrw:mainfrom
datagrail:sync-upstream

Conversation

@npwolf
Copy link
Copy Markdown

@npwolf npwolf commented Mar 4, 2026

Summary

Merges 84 commits from upstream rossjrw/pr-preview-action into our fork, bringing us up to date with all upstream improvements.

Upstream features gained

Feature Impact on Our Fork
Full architecture refactor — Logic extracted from inline action.yml into lib/main.sh, lib/generate-comment.sh, etc. Highaction.yml is completely restructured
QR codes — QR code in PR comments (enabled by default) Medium — new feature we get for free
wait-for-pages-deployment — Wait for Pages build before posting comment Medium — nice improvement
comment toggle — Ability to disable sticky comment Low — additive
Custom commit messagesdeploy-commit-message / remove-commit-message inputs Low — additive
Git author configgit-config-name / git-config-email Low — additive
pages-base-url / pages-base-path — Replaces deprecated custom-url Medium — our code still uses custom-url
pr-number input — Override PR number Low — additive
New output valuesdeployment-action, pages-base-url, preview-url, etc. Low — additive
Bumped github-pages-deploy-action from v4.5.0 to v4.7.4 Low — dependency upgrade
Bumped sticky-pull-request-comment from v2.9.0 to v2.9.2 Low — dependency upgrade
Integration/unit tests — Full test suite added No conflict — all new files
GITHUB_API_URL variable — Uses env var instead of hardcoded URL Low — good for GHES

Conflict resolution

Only action.yml had conflicts. Resolved by taking upstream's restructured version and re-applying our fork's customizations:

  • ssh-key input — re-added and passed through to both deploy and remove steps
  • custom-header input — re-added and used as the header for sticky PR comments (both deploy and remove)
  • custom-message-suffix input — re-added and passed as a new 10th argument to lib/generate-comment.sh, which was updated to render it in the deploy comment

Files changed

  • action.yml — Conflict resolved with our customizations preserved on upstream's new structure
  • lib/generate-comment.sh — Added custom_message_suffix (10th param) support for deploy comments
  • All other files are unmodified upstream additions (new lib scripts, tests, docs, workflows)

Test plan

  • Verify the action deploys a preview correctly with default settings
  • Verify ssh-key passthrough works for SSH-based deployments
  • Verify custom-header sets the sticky comment header correctly
  • Verify custom-message-suffix appends text to the deploy comment
  • Verify new upstream features (QR code, wait-for-pages-deployment) work as expected

🤖 Generated with Claude Code

npwolf and others added 9 commits July 23, 2024 14:43
* allow custom comment headers

* allow custom comment text

* fix default
Sync with 84 upstream commits. Resolves conflict in action.yml by
taking upstream's restructured architecture and re-applying our
customizations (ssh-key, custom-header, custom-message-suffix).

Updates generate-comment.sh to support custom-message-suffix parameter.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@npwolf
Copy link
Copy Markdown
Author

npwolf commented Mar 4, 2026

Opened against upstream by mistake, closing.

@npwolf npwolf closed this Mar 4, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants