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 Any serializer type regression breaking Ruby bindings #1797

Merged
merged 1 commit into from
Oct 25, 2024

Conversation

pedro-psb
Copy link
Member

See context: pulp/pulp_rpm#3639

@pedro-psb pedro-psb force-pushed the fix/type-regression-on-drf-spectacular branch from a203cd3 to 1eaddfb Compare October 24, 2024 19:36
Copy link
Member

@lubosmj lubosmj left a comment

Choose a reason for hiding this comment

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

Thank you for submitting this! 🦜

@lubosmj lubosmj merged commit 5cc3da7 into pulp:main Oct 25, 2024
12 checks passed
Copy link

patchback bot commented Oct 25, 2024

Backport to 2.14: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 5cc3da7 on top of patchback/backports/2.14/5cc3da77f939b296fe544d262e6140c89760524b/pr-1797

Backporting merged PR #1797 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/pulp/pulp_container.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/2.14/5cc3da77f939b296fe544d262e6140c89760524b/pr-1797 upstream/2.14
  4. Now, cherry-pick PR Fix Any serializer type regression breaking Ruby bindings #1797 contents into that branch:
    $ git cherry-pick -x 5cc3da77f939b296fe544d262e6140c89760524b
    If it'll yell at you with something like fatal: Commit 5cc3da77f939b296fe544d262e6140c89760524b is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 5cc3da77f939b296fe544d262e6140c89760524b
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix Any serializer type regression breaking Ruby bindings #1797 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/2.14/5cc3da77f939b296fe544d262e6140c89760524b/pr-1797
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Copy link

patchback bot commented Oct 25, 2024

Backport to 2.15: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 5cc3da7 on top of patchback/backports/2.15/5cc3da77f939b296fe544d262e6140c89760524b/pr-1797

Backporting merged PR #1797 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/pulp/pulp_container.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/2.15/5cc3da77f939b296fe544d262e6140c89760524b/pr-1797 upstream/2.15
  4. Now, cherry-pick PR Fix Any serializer type regression breaking Ruby bindings #1797 contents into that branch:
    $ git cherry-pick -x 5cc3da77f939b296fe544d262e6140c89760524b
    If it'll yell at you with something like fatal: Commit 5cc3da77f939b296fe544d262e6140c89760524b is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 5cc3da77f939b296fe544d262e6140c89760524b
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix Any serializer type regression breaking Ruby bindings #1797 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/2.15/5cc3da77f939b296fe544d262e6140c89760524b/pr-1797
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Copy link

patchback bot commented Oct 25, 2024

Backport to 2.16: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 5cc3da7 on top of patchback/backports/2.16/5cc3da77f939b296fe544d262e6140c89760524b/pr-1797

Backporting merged PR #1797 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/pulp/pulp_container.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/2.16/5cc3da77f939b296fe544d262e6140c89760524b/pr-1797 upstream/2.16
  4. Now, cherry-pick PR Fix Any serializer type regression breaking Ruby bindings #1797 contents into that branch:
    $ git cherry-pick -x 5cc3da77f939b296fe544d262e6140c89760524b
    If it'll yell at you with something like fatal: Commit 5cc3da77f939b296fe544d262e6140c89760524b is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 5cc3da77f939b296fe544d262e6140c89760524b
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix Any serializer type regression breaking Ruby bindings #1797 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/2.16/5cc3da77f939b296fe544d262e6140c89760524b/pr-1797
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Copy link

patchback bot commented Oct 25, 2024

Backport to 2.21: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 5cc3da7 on top of patchback/backports/2.21/5cc3da77f939b296fe544d262e6140c89760524b/pr-1797

Backporting merged PR #1797 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/pulp/pulp_container.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/2.21/5cc3da77f939b296fe544d262e6140c89760524b/pr-1797 upstream/2.21
  4. Now, cherry-pick PR Fix Any serializer type regression breaking Ruby bindings #1797 contents into that branch:
    $ git cherry-pick -x 5cc3da77f939b296fe544d262e6140c89760524b
    If it'll yell at you with something like fatal: Commit 5cc3da77f939b296fe544d262e6140c89760524b is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 5cc3da77f939b296fe544d262e6140c89760524b
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix Any serializer type regression breaking Ruby bindings #1797 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/2.21/5cc3da77f939b296fe544d262e6140c89760524b/pr-1797
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Copy link

patchback bot commented Oct 25, 2024

Backport to 2.20: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 5cc3da7 on top of patchback/backports/2.20/5cc3da77f939b296fe544d262e6140c89760524b/pr-1797

Backporting merged PR #1797 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/pulp/pulp_container.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/2.20/5cc3da77f939b296fe544d262e6140c89760524b/pr-1797 upstream/2.20
  4. Now, cherry-pick PR Fix Any serializer type regression breaking Ruby bindings #1797 contents into that branch:
    $ git cherry-pick -x 5cc3da77f939b296fe544d262e6140c89760524b
    If it'll yell at you with something like fatal: Commit 5cc3da77f939b296fe544d262e6140c89760524b is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 5cc3da77f939b296fe544d262e6140c89760524b
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix Any serializer type regression breaking Ruby bindings #1797 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/2.20/5cc3da77f939b296fe544d262e6140c89760524b/pr-1797
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@lubosmj
Copy link
Member

lubosmj commented Oct 25, 2024

These fields were introduced in 2.19. I am backporting the change only to 2.20 and 2.2.

@pedro-psb pedro-psb deleted the fix/type-regression-on-drf-spectacular branch October 25, 2024 10:21
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