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.

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

Jump to bottom

Substitution of branch names #98

Merged
merged 4 commits into from
Jun 8, 2023
Merged

Substitution of branch names #98

merged 4 commits into from
Jun 8, 2023

Conversation

christophfroehlich
Copy link
Contributor

I realized that the extension used from #85 works only in the preamble but not within directives, i.e., refs/links etc.
I reverted that change and propose the usage of the already existing macro expand_macros connected to the source-read event of sphinx: The key {REPOS_FILE_BRANCH} was already existing, and works now everywhere as far as I know.

This was referenced May 22, 2023
Merged
Merged
Merged
@bmagyar
Copy link
Member

bmagyar commented May 22, 2023

Do we need to update the foxy branch?

@christophfroehlich
Copy link
Contributor Author

I'm not sure why CI fails now, sphinxcontrib.globalsubs is not included explicitly anywhere now.

@christophfroehlich
Copy link
Contributor Author

Do we need to update the foxy branch?

I think the conf.py is only used from the master branch, but the links could be updated in foxy etc

@christophfroehlich
Copy link
Contributor Author

And we have to merge the linked PRs first, otherwise the not-any-more-existing substitution will fail.

@bmagyar
Copy link
Member

bmagyar commented May 23, 2023 •
edited
Loading

But if there's a deployment between merging the linked PRs and this, there will be broken links on the page for a short amount of time, nicht wahr?

@christophfroehlich
Copy link
Contributor Author

christophfroehlich commented May 23, 2023 via email

@bmagyar
Copy link
Member

bmagyar commented May 23, 2023 via email

destogl
destogl approved these changes May 24, 2023
View reviewed changes
Copy link
Member

@destogl destogl left a comment

Choose a reason for hiding this comment

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

Can be merged when CI is happy

@christophfroehlich
Copy link
Contributor Author

If I'd know why it is failing 🤔

@christophfroehlich
Copy link
Contributor Author

ros2_control_demos was published successfully with the latest changes. lets merge the PRs in the other two repos, then I'll try to fix the failing CI. maybe this is an artefact of the build script, which checks out the master branch instead of the one from the PR, where the missing requirement was not installed from.

@bmagyar
Copy link
Member

bmagyar commented May 27, 2023

Branches merged

@christophfroehlich christophfroehlich mentioned this pull request Jun 5, 2023
Merged
@christophfroehlich christophfroehlich merged commit 45005b5 into ros-controls:master Jun 8, 2023
@christophfroehlich christophfroehlich deleted the github_subs branch June 8, 2023 20:44
This was referenced Jun 8, 2023
Merged
Merged
@christophfroehlich
Copy link
Contributor Author

@Mergifyio backport humble

@mergify
Copy link
Contributor

mergify bot commented Jun 12, 2023 •
edited
Loading

backport humble

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Jun 12, 2023
@christophfroehlich @mergify
Substitution of branch names (#98)
bfe136f 
* Revert "Add global_substitutions to fix github links (#85)"

This reverts commit fed3b2a.

* Use branch name substitution for all links

(cherry picked from commit 45005b5)

# Conflicts:
#	conf.py
#	doc/getting_started/getting_started.rst
@mergify mergify bot mentioned this pull request Jun 12, 2023
Merged
christophfroehlich added a commit that referenced this pull request Jun 12, 2023
@christophfroehlich
Substitution of branch names (#98)
680d79f 
* Revert "Add global_substitutions to fix github links (#85)"

This reverts commit fed3b2a.

* Use branch name substitution for all links

(cherry picked from commit 45005b5)
christophfroehlich added a commit that referenced this pull request Jun 12, 2023
@mergify @christophfroehlich
Substitution of branch names (#98) (#122)
cd4ab39 
* Revert "Add global_substitutions to fix github links (#85)"

This reverts commit fed3b2a.

* Use branch name substitution for all links

(cherry picked from commit 45005b5)

Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@destogl destogl destogl approved these changes

@bmagyar bmagyar bmagyar approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@christophfroehlich @bmagyar @destogl