Skip to content

Revert fix: make e2e scoping on-by-default so fork PRs benefit#7948

Open
aloisklink wants to merge 1 commit into
mermaid-js:developfrom
aloisklink:ci/revert-CI-scoping
Open

Revert fix: make e2e scoping on-by-default so fork PRs benefit#7948
aloisklink wants to merge 1 commit into
mermaid-js:developfrom
aloisklink:ci/revert-CI-scoping

Conversation

@aloisklink

@aloisklink aloisklink commented Jul 7, 2026

Copy link
Copy Markdown
Member

📑 Summary

This reverts commit 71f9731/#7709, which will disable E2E scoping from PRs from forks.

The E2E scoping seems to be broken with Argos (causing it to be stuck with Waiting for status to be reported — Build is queued), and it's much less important now that we're batching image uploads by default since 1265ee1.

Without reverting 71f9731, we can disable E2E scoping for our own internal PRs by setting E2E_SCOPE_BY_DIAGRAM, but this won't help with PRs from forks.

image

See: 1265ee1

📏 Design Decisions

I'm sure we can probably modify how we're calling Argos to tell it when a build is queued when running a CI subset, but considering we're batching screenshots anyway, it's not too big of a deal to disable this code completely.

📋 Tasks

Make sure you

  • 📖 have read the contribution guidelines
  • 💻 have added necessary unit/e2e tests.
  • 📓 have added documentation. Make sure MERMAID_RELEASE_VERSION is used for all new features.
  • 🦋 If your PR makes a change that should be noted in one or more packages' changelogs, generate a changeset by running pnpm changeset and following the prompts. Changesets that add features should be minor and those that fix bugs should be patch. Please prefix changeset messages with feat:, fix:, or chore:.

This PR reverts the E2E scoping change that disabled forked-PR scoped runs.

  • Removes the detect-scope kill-switch behavior that treated scoping as disabled only when E2E_SCOPE_BY_DIAGRAM was explicitly "false".
  • Updates the E2E_SCOPE_BY_DIAGRAM env derivation so the scoped workflow is no longer enabled by default via the repo variable fallback.
  • Effectively turns off this code path entirely to avoid Argos getting stuck on queued E2E checks for forked PRs.

…scope-skip-ignorable-files

This reverts commit
71f9731 (Merge pull request mermaid-js#7709 from mermaid-js/chore/e2e-scope-skip-ignorable-files, 2026-05-05).

The E2E scoping seems to be broken with Argos, and it's much less
important now that we're batching image uploads by default since
1265ee1 (feat(e2e): batch Argos screenshots into folder-wise composite sheets, 2026-06-18).

By reverting 71f9731, we can disable E2E scoping for our own internal
PRs by setting `E2E_SCOPE_BY_DIAGRAM`, but this won't help with PRs from
forks.

See: 1265ee1
@changeset-bot

changeset-bot Bot commented Jul 7, 2026

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: 30103f4

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@netlify

netlify Bot commented Jul 7, 2026

Copy link
Copy Markdown

Deploy Preview for mermaid-js ready!

Name Link
🔨 Latest commit 30103f4
🔍 Latest deploy log https://app.netlify.com/projects/mermaid-js/deploys/6a4cd636a98fbf00080e1806
😎 Deploy Preview https://deploy-preview-7948--mermaid-js.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.
🤖 Make changes Run an agent on this branch

To edit notification comments on pull requests, go to your Netlify project configuration.

@coderabbitai

coderabbitai Bot commented Jul 7, 2026

Copy link
Copy Markdown

Review Change Stack

📝 Walkthrough

Walkthrough

The e2e.yml workflow's scoping kill-switch logic was changed from defaulting to enabled (disabled only when explicitly "false") to defaulting to disabled (enabled only when explicitly "true"), affecting both the detect-scope step condition and the job-level environment variable expression.

Changes

E2E Scope Flag Default Behavior

Layer / File(s) Summary
Scope flag logic update
.github/workflows/e2e.yml
The detect-scope step's kill-switch condition and the E2E_SCOPE_BY_DIAGRAM job environment expression are both changed so scoping is disabled by default unless the repo variable is explicitly 'true', reversing prior default-on behavior.

Estimated code review effort: 2 (Simple) | ~5 minutes

Related Issues: None found in the provided context.

Related PRs: None found in the provided context.

Suggested labels: ci, workflow

Suggested reviewers: None found in the provided context.

🐰 A flag once loose, now held up tight,
"true" or nothing, no more slight,
the full suite waits unless we say,
scope me now, in workflow's way.

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Title check ✅ Passed The title clearly states the PR reverts the E2E scoping change and matches the main change set.
Description check ✅ Passed The description follows the template and covers summary, design decisions, and tasks, with only the issue reference left blank.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands.

@pkg-pr-new

pkg-pr-new Bot commented Jul 7, 2026

Copy link
Copy Markdown

Open in StackBlitz

@mermaid-js/examples

npm i https://pkg.pr.new/@mermaid-js/examples@7948

mermaid

npm i https://pkg.pr.new/mermaid@7948

@mermaid-js/layout-elk

npm i https://pkg.pr.new/@mermaid-js/layout-elk@7948

@mermaid-js/layout-tidy-tree

npm i https://pkg.pr.new/@mermaid-js/layout-tidy-tree@7948

@mermaid-js/mermaid-zenuml

npm i https://pkg.pr.new/@mermaid-js/mermaid-zenuml@7948

@mermaid-js/parser

npm i https://pkg.pr.new/@mermaid-js/parser@7948

@mermaid-js/tiny

npm i https://pkg.pr.new/@mermaid-js/tiny@7948

commit: 30103f4

@aloisklink aloisklink changed the title revert: Merge pull request #7709 from mermaid-js/chore/e2e-scope-skip-ignorable-files Revert fix: make e2e scoping on-by-default so fork PRs benefit Jul 7, 2026
@codecov

codecov Bot commented Jul 7, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 77.52%. Comparing base (0d1ee0a) to head (30103f4).
⚠️ Report is 5 commits behind head on develop.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #7948      +/-   ##
===========================================
+ Coverage    77.42%   77.52%   +0.10%     
===========================================
  Files          564      564              
  Lines        74900    74906       +6     
  Branches     12659    14617    +1958     
===========================================
+ Hits         57988    58068      +80     
+ Misses       15915    15841      -74     
  Partials       997      997              
Flag Coverage Δ
e2e 70.67% <ø> (+0.26%) ⬆️
unit 74.82% <ø> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.
see 6 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@argos-ci

argos-ci Bot commented Jul 7, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Argos notifications ↗︎

Build Status Details Updated (UTC)
default (Inspect) ✅ No changes detected - Jul 7, 2026, 10:55 AM

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