Skip to content
This repository has been archived by the owner on Jan 27, 2025. It is now read-only.

Manual update from ferrocene/ferrocene #46

Merged
merged 1 commit into from
Nov 26, 2024
Merged

Conversation

Hoverbear
Copy link
Member

@Hoverbear Hoverbear commented Nov 20, 2024

mirrored-commit: 8ac7393f92c3b9b16a6481488488ed04745c70c7

@Hoverbear Hoverbear self-assigned this Nov 20, 2024
bors-ferrocene bot added a commit to ferrocene/ferrocene that referenced this pull request Nov 20, 2024
1100: Fix a python formatting issue raised by black r=Hoverbear a=Hoverbear

Just a little whitespace! (See ferrocene/sphinx-shared-resources#46)

1103: let ci env vars propagate to setup-ubuntu.sh r=Hoverbear a=tshepang

This fixes the issue where disk space was not freed.

Should of been part of 3f84720.

Co-authored-by: Ana Hobden <[email protected]>
Co-authored-by: Tshepang Mbambo <[email protected]>
@Hoverbear Hoverbear force-pushed the hoverbear/manually-update branch from c70ce1a to 5f32ef8 Compare November 20, 2024 19:51
@Hoverbear Hoverbear requested review from amanjeev and removed request for amanjeev November 20, 2024 19:52
@amanjeev
Copy link
Member

Just stating that these changes do not include changes still umerged in ferrocene/ferrocene#1049.

Would this basically unblock the mirror CI?

pvdrz pushed a commit to ferrocene/ferrocene that referenced this pull request Nov 20, 2024
1100: Fix a python formatting issue raised by black r=Hoverbear a=Hoverbear

Just a little whitespace! (See ferrocene/sphinx-shared-resources#46)

1103: let ci env vars propagate to setup-ubuntu.sh r=Hoverbear a=tshepang

This fixes the issue where disk space was not freed.

Should of been part of 3f84720.

Co-authored-by: Ana Hobden <[email protected]>
Co-authored-by: Tshepang Mbambo <[email protected]>
@amanjeev
Copy link
Member

amanjeev commented Nov 20, 2024

I am a bit confused with this. Your branch contains this file ferrocene_intersphinx_support.py.

But no such file exists in ferrocene repo in the same exts directory of sphinx-shared-resources.

@Hoverbear
Copy link
Member Author

Would this basically unblock the mirror CI?

That's my hope, yeah.

@Hoverbear Hoverbear force-pushed the hoverbear/manually-update branch from 5f32ef8 to d0f318f Compare November 22, 2024 20:55
@Hoverbear
Copy link
Member Author

@amanjeev I did a better job this time I think. Mind taking another look?

@amanjeev
Copy link
Member

amanjeev commented Nov 25, 2024

I think we missed one file deletion:

  • in Ferrocene repo: theme.conf was deleted (ferrocene/doc/sphinx-shared-resources/themes/ferrocene/theme.conf was renamed to ferrocene/doc/sphinx-shared-resources/themes/ferrocene/theme.toml)
  • in this repo we still have theme.toml as well as theme.conf and it must be deleted to achieve parity with ferrocene repo.

@amanjeev amanjeev self-requested a review November 25, 2024 20:07
mirrored-commit: 79cfbf8b352b0611672aefbbe877d9584fc11d6c
@Hoverbear Hoverbear force-pushed the hoverbear/manually-update branch from d0f318f to 7de064b Compare November 25, 2024 20:17
Copy link
Member

@amanjeev amanjeev left a comment

Choose a reason for hiding this comment

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

I approve this message.

@Hoverbear
Copy link
Member Author

bors merge

@amanjeev amanjeev merged commit 20befa7 into main Nov 26, 2024
2 checks passed
@amanjeev
Copy link
Member

I merged this given the intention of @Hoverbear with borse merge message is to merge this. We don't use bors in this repo.

@tshepang tshepang deleted the hoverbear/manually-update branch November 26, 2024 11:18
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants