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

LTS backports/sync 230929 #1189

Merged
merged 2 commits into from
Sep 29, 2023
Merged

Conversation

gonzalocasas
Copy link
Member

@gonzalocasas gonzalocasas commented Sep 29, 2023

Closes #1186

Sync the following merged pull requests into LTS 1.x:

What type of change is this?

  • Sync to LTS branch

Process

The process to create this sync is the following:

  • Create a new branch off of the LTS branch for syncs up to current date, e.g. lts-backports/sync-230423
  • For each merged pull request that needs to be merged into LTS:
    • Cherry pick ranges of commits (you can use the github commits page of the PR to copy the oldest and newest commit hash): e.g. git cherry-pick "fdc342d15a2908f4b72f437aeb05165eba098920^..f3874fea755ba3c6bdb28fcf33d870c4dbad451e" (see this stackoverflow answer for details)
    • Fix any pending conflicts (using the Conflict editor of vscode seems to be the easiest option.
    • Confirm the cherry pick operation with git cherry-pick --continue
    • Repeat for the next pull request
    • Ensure the CHANGELOG is correct, after cherry picking, the entries might have been added to previous releases instead of the Unreleased section.
  • Push the sync branch and create a pull request to the LTS branch

After this PR has been merged:

  • Switch to the LTS branch
  • Create a new release using invoke release patch and push
  • Update doc_versions.txt and versions.json
  • Update the cloudflare rules to redirect the previous LTS doc links to the newest
  • Create a new issue for the next LTS sync

@gonzalocasas gonzalocasas changed the title fixed syntax error when numpy is in path but IronPython LTS backports/sync 230929 Sep 29, 2023
Copy link
Member

@chenkasirer chenkasirer left a comment

Choose a reason for hiding this comment

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

LGTM!

@gonzalocasas gonzalocasas merged commit 84d8272 into COMPAS-1.x.LTS Sep 29, 2023
15 checks passed
@gonzalocasas gonzalocasas deleted the lts-backports/sync-230929 branch September 29, 2023 14:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants