Skip to content
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.

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

Fix a bug in retrofit-worktree.sh #38676

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from

Conversation

kwankyu
Copy link
Collaborator

@kwankyu kwankyu commented Sep 19, 2024

as shown in https://github.com/sagemath/sage/actions/runs/10919536449/job/30307397930?pr=38659, where the error message

[sagemath_doc_html-none] [spkg-install] [installat] /sage/src/doc/en/installation/linux.rst: WARNING: document isn't included in any toctree

is due to the file src/doc/en/installation/linux.rst that is not cleaned up in the "new" branch being tested.

The problem is that the script does not clean the worktree well enough when checking out the "new" branch.

Test: https://github.com/sagemath/sage/actions/runs/10934323900/job/30354225389?pr=38659, an excerpt from which is

#30 6.340 + cd worktree-pre
#30 6.340 + git add -A
#30 6.989 + git commit --quiet --allow-empty -m old -a
#30 7.071 + git tag -f old
#30 7.073 + git checkout -f new
#30 7.106 Previous HEAD position was 98054dd old
#30 7.106 HEAD is now at b05f634 new
#30 7.107 + git clean -fd
#30 7.159 Removing src/doc/en/installation/linux.rst
#30 7.159 + git status
#30 7.243 HEAD detached at new
#30 7.243 nothing to commit, working tree clean

📝 Checklist

  • The title is concise and informative.
  • The description explains in detail what this PR is about.
  • I have linked a relevant issue or discussion.
  • I have created tests covering the changes.
  • I have updated the documentation and checked the documentation preview.

⌛ Dependencies

@kwankyu kwankyu changed the title Fix a bug in retrofit Fix a bug in retrofit-worktree.sh Sep 19, 2024
@kwankyu kwankyu added p: CI Fix merged before running CI tests labels Sep 19, 2024
Copy link

github-actions bot commented Sep 19, 2024

Documentation preview for this PR (built with commit 63f5007; changes) is ready! 🎉
This preview will update shortly after each push to this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant