Skip to content

Comments

fix: merge detection issue#56

Merged
bosbaber merged 4 commits intostagingfrom
stephan/intorg-416
Feb 20, 2026
Merged

fix: merge detection issue#56
bosbaber merged 4 commits intostagingfrom
stephan/intorg-416

Conversation

@bosbaber
Copy link
Contributor

No description provided.

Copilot AI review requested due to automatic review settings February 20, 2026 20:00
@bosbaber bosbaber merged commit ad0727b into staging Feb 20, 2026
1 check passed
@bosbaber bosbaber deleted the stephan/intorg-416 branch February 20, 2026 20:03
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR aims to fix merge detection in the staging merge GitHub Actions workflow for the interledger.org site/CMS automation, while also adjusting workspace configuration and making a couple of small content/docs edits.

Changes:

  • Improve merged-PR detection logic in .github/workflows/staging-merge.yml and adjust job dependencies/install step.
  • Add cms to pnpm-workspace.yaml so pnpm install can install workspace dependencies from the repo root.
  • Minor edits to CMS README revision marker and a single blog copy tweak.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

File Description
src/content/blog/2026-01-29-interledger-foundation-awards-200000-social-web-foundation-support-decentralized-social-media.mdx Minor copy edit in blog post body text.
pnpm-workspace.yaml Declares cms as a pnpm workspace package to support root-level installs.
cms/README.md Updates the “Last updated / Revision” comment.
.github/workflows/staging-merge.yml Enhances merge detection and adjusts sync-mdx-to-strapi dependencies + install step.
Comments suppressed due to low confidence (3)

.github/workflows/staging-merge.yml:155

  • sync-mdx-to-strapi uses always() while also depending on rebuild-strapi. If rebuild-strapi runs and fails, this job can still run and attempt to sync against a potentially broken/half-updated Strapi instance. Consider adding an explicit guard on needs.rebuild-strapi.result (e.g., allow success/skipped, block failure/cancelled) so sync only runs when the rebuild didn’t fail.
    needs: [check-pr-merge, rebuild-strapi]
    if: |
      always() &&
      ((needs.check-pr-merge.outputs.is_merged_pr == 'true' && needs.check-pr-merge.outputs.content_changed == 'true') ||
      needs.check-pr-merge.outputs.is_merged_pr == 'manual')

.github/workflows/staging-merge.yml:56

  • isMergeCommit is assigned the result of .match(...) (array/null) but is later used as a boolean. This works, but the name is misleading and makes the logic easy to misread/extend incorrectly. Consider switching to a boolean check (e.g., .test(...) or Boolean(match)) or renaming the variable to reflect that it’s a match object.
            const isMergeCommit = commit.commit.message.match(/^Merge pull request #(\d+)/)

src/content/blog/2026-01-29-interledger-foundation-awards-200000-social-web-foundation-support-decentralized-social-media.mdx:16

  • This PR is titled as a merge-detection fix, but this change is an unrelated copy edit in a blog post. Consider reverting this change or moving it to a separate PR to keep the workflow fix isolated and easier to audit/roll back.
For creators, publishers, and community-run platforms, building a sustainable future on the web has become increasingly difficult. Advertising revenues continue to decline, audiences are experiencing subscription fatigue, and smaller publishers are often left choosing between paywalls, platform dependence, or just giving content away for free.

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.

1 participant