Skip to content

Keep DiffTour links valid after merge #29

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
marcleblanc2 merged 1 commit into from
Aug 26, 2026
+15 −6
Merged

Keep DiffTour links valid after merge #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 15 additions & 6 deletions .github/workflows/difftour-link.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Diff Tour link

on:
pull_request:
types: [opened, synchronize, reopened]
types: [opened, synchronize, reopened, closed]

permissions:
pull-requests: write # needed to create/update comments
Expand All @@ -12,18 +12,27 @@ jobs:
runs-on: ubuntu-latest
# DiffTour resolves branch names against this repository, so the head
# branch must live on this repo (skip fork PRs).
if: github.event.pull_request.head.repo.full_name == github.repository
# Closed PRs only need an update when they were merged.
if: >
github.event.pull_request.head.repo.full_name == github.repository
&& (github.event.action != 'closed' || github.event.pull_request.merged)
steps:
- uses: actions/github-script@v7
with:
script: |
const instance = 'https://sourcegraph.sourcegraph.com';
const repo = `github.com/${context.payload.repository.full_name}`;
const base = context.payload.pull_request.base.ref;
const head = context.payload.pull_request.head.ref;
const pullRequest = context.payload.pull_request;

const range = `${encodeURIComponent(base)}...${encodeURIComponent(head)}`;
const url = `${instance}/r/${repo}/-/compare/${range}?mode=Tour`;
let url;
if (pullRequest.merged) {
const commit = encodeURIComponent(pullRequest.merge_commit_sha);
url = `${instance}/r/${repo}/-/commit/${commit}?mode=Tour`;
} else {
const base = encodeURIComponent(pullRequest.base.ref);
const head = encodeURIComponent(pullRequest.head.ref);
url = `${instance}/r/${repo}/-/compare/${base}...${head}?mode=Tour`;
}

const marker = '<!-- difftour-link -->';
const body = `${marker}\n[Open the Diff Tour for this PR in Sourcegraph](${url})`;
Expand Down
Loading