Skip to content

fix: merge detection issue #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bosbaber merged 4 commits into from
Feb 20, 2026
Merged

fix: merge detection issue #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
206cc3b
ci: trigger another test
bosbaber Feb 20, 2026
8a54daa
ci: trigger another test
bosbaber Feb 20, 2026
bdd38de
fix: improve PR merge detection in workflow
bosbaber Feb 20, 2026
9983f57
Merge remote-tracking branch 'origin/staging' into stephan/intorg-416
bosbaber Feb 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion .github/workflows/staging-merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,16 @@ jobs:
const repo = context.repo.repo
const sha = context.sha

// Check if the commit message indicates a PR merge
const { data: commit } = await github.rest.repos.getCommit({
owner,
repo,
ref: sha
})

const isMergeCommit = commit.commit.message.match(/^Merge pull request #(\d+)/)

// Also check via API for associated PRs
const { data: prs } = await github.rest.repos.listPullRequestsAssociatedWithCommit({
owner,
repo,
Expand All @@ -55,11 +65,13 @@ jobs:

const mergedIntoStaging = prs.some((pr) =>
pr.merged_at && pr.base && pr.base.ref === 'staging'
)
) || (isMergeCommit && commit.parents.length > 1)

core.setOutput('merged_pr', mergedIntoStaging ? 'true' : 'false')
if (!mergedIntoStaging) {
core.notice('No merged PR into staging found for this commit; workflow steps will be skipped.')
} else {
core.notice('Merged PR detected into staging.')
}

- name: Detect changed paths
Expand Down
2 changes: 1 addition & 1 deletion cms/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

This is the Strapi CMS for managing content that will be rendered on the Interledger Developers Portal. The CMS automatically generates MDX files that are read by the Astro site.

<!-- Last updated: 2026-02-20 -->
<!-- Last updated: 2026-02-20 | Revision 3 -->

## Features

Expand Down
2 changes: 1 addition & 1 deletion ...tion-awards-200000-social-web-foundation-support-decentralized-social-media.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ tags:
- Announcements
---

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 giving content away for free.
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.

At the same time, decentralized and community-run social platforms are gaining momentum. These platforms offer greater control over distribution and audience relationships, but they often lack viable monetization tools.

Expand Down