Skip to content

Exclude literal_block with source attribute from Document ID#1494

Merged
bors-ferrocene[bot] merged 1 commit into
mainfrom
hoverbear/exclude-literal_block-with-source-from-document-id
Jun 2, 2025
Merged

Exclude literal_block with source attribute from Document ID#1494
bors-ferrocene[bot] merged 1 commit into
mainfrom
hoverbear/exclude-literal_block-with-source-from-document-id

Conversation

@Hoverbear

Copy link
Copy Markdown
Member

While testing signing (#1493, #1471, #1469) we noticed that Internal Procedures was creating a different Document ID when built locally vs CI. When we diffed the doctrees we noticed the following diff:

-            <literal_block force="False" highlight_args="{'linenostart': 1}" language="default" linenos="False" source="/home/ci/project/src/bootstrap/src/ferrocene/test_variants.rs" xml:space="preserve">("2021", &amp;[
+            <literal_block force="False" highlight_args="{'linenostart': 1}" language="default" linenos="False" source="/Users/ana/git/ferrocene/ferrocene/src/bootstrap/src/ferrocene/test_variants.rs" xml:space="preserve">("2021", &amp;[

This PR expands our existing exclusion to cover this as well.

@Hoverbear Hoverbear self-assigned this May 30, 2025

@japaric japaric left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

confirmed to fix repro issue when building docs in #1499 and #1493

@tshepang

tshepang commented Jun 2, 2025

Copy link
Copy Markdown
Member

bors merge

@bors-ferrocene

bors-ferrocene Bot commented Jun 2, 2025

Copy link
Copy Markdown
Contributor

Build succeeded:

@bors-ferrocene bors-ferrocene Bot merged commit 927efea into main Jun 2, 2025
5 checks passed
@bors-ferrocene bors-ferrocene Bot deleted the hoverbear/exclude-literal_block-with-source-from-document-id branch June 2, 2025 16:32
ferrocene-automations Bot pushed a commit that referenced this pull request Jun 2, 2025
bors-ferrocene Bot added a commit that referenced this pull request Jun 2, 2025
1500: Backport to `release/1.86` r=Hoverbear a=ferrocene-automations[bot]

This PR backports the following PRs to the `release/1.86` branch:

* #1491
* #1494

Note that the automation failed to backport some PRs automatically. Check out the [backport:manual](https://github.com/ferrocene/ferrocene/pulls?q=is%3Apr+label%3Abackport%3Amanual) for a list of them.

Co-authored-by: Ana Hobden <[email protected]>
@ferrocene-automations ferrocene-automations Bot added the backport:manual PR requiring manual intervention to backport label Jun 3, 2025
@tshepang tshepang removed backport:manual PR requiring manual intervention to backport backport:1.86 labels Jun 3, 2025
@Hoverbear Hoverbear mentioned this pull request Aug 25, 2025
ferrocene-automations Bot pushed a commit that referenced this pull request Aug 25, 2025
bors-ferrocene Bot added a commit that referenced this pull request Aug 25, 2025
1683: [1.88] "upcoming release" will not be updated for this branch r=Hoverbear a=tshepang

This is similar to #1495

1699: Backport to `release/1.88` r=Hoverbear a=ferrocene-automations[bot]

This PR backports the following PRs to the `release/1.88` branch:

* #1494

Co-authored-by: Tshepang Mbambo <[email protected]>
Co-authored-by: Ana Hobden <[email protected]>
@ferrocene-automations ferrocene-automations Bot added the backport:manual PR requiring manual intervention to backport label Aug 26, 2025
@tshepang tshepang removed backport:manual PR requiring manual intervention to backport backport:1.88 labels Aug 26, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants