Skip to content

Use a version placeholder in doc_ids table #1570

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

Merged
merged 3 commits into from
Mar 28, 2022
Merged

Conversation

delvedor
Copy link
Member

As titled.
This will solve backporting issues, but unfortunately, we can't automatically add the version in the output json, otherwise, we will have again the backporting issue.
The URL updating needs to be demanded to code generators.

@delvedor delvedor requested review from szabosteve, lcawl and a team March 23, 2022 07:13
@lcawl
Copy link
Contributor

lcawl commented Mar 23, 2022

Depending on where this is resolved, {version} might be a problematic choice, since we already use that as an attribute for the full version.release.modifier in our documentation (e.g. see https://github.com/elastic/docs/blob/master/shared/versions/stack/8.1.asciidoc). What we currently use in the documentation builds for just version.release is {branch}. Should we use the same placeholders here?

@delvedor
Copy link
Member Author

@lcawl done! :)

Copy link
Contributor

@lcawl lcawl left a comment

Choose a reason for hiding this comment

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

Thanks! LGTM

@delvedor delvedor merged commit f300b01 into main Mar 28, 2022
@delvedor delvedor deleted the doc_ids_placeholder branch March 28, 2022 14:06
@github-actions
Copy link
Contributor

The backport to 8.0 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-8.0 8.0
# Navigate to the new working tree
cd .worktrees/backport-8.0
# Create a new branch
git switch --create backport-1570-to-8.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick --mainline 1 f300b0102ae6c4aef871f15bae66ad7aeba7da45
# Push it to GitHub
git push --set-upstream origin backport-1570-to-8.0
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-8.0

Then, create a pull request where the base branch is 8.0 and the compare/head branch is backport-1570-to-8.0.

@github-actions
Copy link
Contributor

The backport to 8.1 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-8.1 8.1
# Navigate to the new working tree
cd .worktrees/backport-8.1
# Create a new branch
git switch --create backport-1570-to-8.1
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick --mainline 1 f300b0102ae6c4aef871f15bae66ad7aeba7da45
# Push it to GitHub
git push --set-upstream origin backport-1570-to-8.1
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-8.1

Then, create a pull request where the base branch is 8.1 and the compare/head branch is backport-1570-to-8.1.

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.

2 participants