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

Upgrade JSON to 20231013 to fix CVE-2023-5072 #912

Merged
merged 1 commit into from
Oct 16, 2023

Conversation

derek-ho
Copy link
Collaborator

@derek-ho derek-ho commented Oct 16, 2023

Description

Upgrade JSON to 20231013 to fix CVE-2023-5072

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@derek-ho derek-ho merged commit b68990f into opensearch-project:main Oct 16, 2023
12 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 16, 2023
Signed-off-by: Derek Ho <[email protected]>
(cherry picked from commit b68990f)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 16, 2023
Signed-off-by: Derek Ho <[email protected]>
(cherry picked from commit b68990f)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
derek-ho pushed a commit that referenced this pull request Oct 16, 2023
(cherry picked from commit b68990f)

Signed-off-by: Derek Ho <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
derek-ho pushed a commit that referenced this pull request Oct 16, 2023
(cherry picked from commit b68990f)

Signed-off-by: Derek Ho <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
peterzhuamazon added a commit that referenced this pull request Oct 31, 2023
* Remove odfe bwc test (#408) (#409)

* removed odfe bwc test

Signed-off-by: Shenoy Pratik <[email protected]>

* removed bwc test from workflows

Signed-off-by: Shenoy Pratik <[email protected]>
(cherry picked from commit 556b5fb)

Co-authored-by: Shenoy Pratik <[email protected]>

* Remove odfe bwc test (#408)

* removed odfe bwc test

Signed-off-by: Shenoy Pratik <[email protected]>

* removed bwc test from workflows

Signed-off-by: Shenoy Pratik <[email protected]>
(cherry picked from commit 556b5fb)

* Bump version 2.2.0

Signed-off-by: vamsi-amazon <[email protected]>

* Bump version 2.2.0 (#413)

Signed-off-by: vamsi-amazon <[email protected]>
(cherry picked from commit c91534a)

Co-authored-by: vamsi-amazon <[email protected]>

* Release notes for 2.2.0

Signed-off-by: vamsi-amazon <[email protected]>
(cherry picked from commit f43f7de)

* Release notes for 2.2.0

Signed-off-by: vamsi-amazon <[email protected]>
(cherry picked from commit f43f7de)

* [2.x] Restrict chromium requests (#435)

* Fix regex validation, detect iframe, embed, object tags

Signed-off-by: Joshua Li <[email protected]>

* Disallow redirection to non-localhost urls

Signed-off-by: Joshua Li <[email protected]>

* Disallow connection to non-allowlisted urls

Signed-off-by: Joshua Li <[email protected]>

* Disable JIT

Signed-off-by: Joshua Li <[email protected]>

* Fix workflow

Signed-off-by: Joshua Li <[email protected]>

* Try to fix CI

Signed-off-by: Joshua Li <[email protected]>

* Fix localstorage logic

Signed-off-by: Joshua Li <[email protected]>

Signed-off-by: Joshua Li <[email protected]>

* [2.2] Restrict chromium requests (#431)

* Fix regex validation, detect iframe, embed, object tags

Signed-off-by: Joshua Li <[email protected]>

* Disallow redirection to non-localhost urls

Signed-off-by: Joshua Li <[email protected]>

* Disallow connection to non-allowlisted urls

Signed-off-by: Joshua Li <[email protected]>

* Disable JIT

Signed-off-by: Joshua Li <[email protected]>

* Fix workflow

Signed-off-by: Joshua Li <[email protected]>

* Try to fix CI

Signed-off-by: Joshua Li <[email protected]>

* Fix localstorage logic

Signed-off-by: Joshua Li <[email protected]>

Signed-off-by: Joshua Li <[email protected]>

* Increment version to 2.2.1-SNAPSHOT

Signed-off-by: opensearch-ci-bot <[email protected]>

* Increment version to 2.3.0-SNAPSHOT

Signed-off-by: opensearch-ci-bot <[email protected]>

* Added release notes for 2.2.1 release

Signed-off-by: vamsi-amazon <[email protected]>

* Merge pull request #459 from mengweieric/release-notes-2.3.0

Release notes for 2.3.0

(cherry picked from commit b0c5643)

* [2.x] Upgrade puppeteer (#489)

* upgrade puppeteer & change report timeout

Signed-off-by: Rupal Mahajan <[email protected]>

* Change timeout

Signed-off-by: Rupal Mahajan <[email protected]>

Signed-off-by: Rupal Mahajan <[email protected]>

* Bump verison 2.4.0 (#499)

Signed-off-by: Rupal Mahajan <[email protected]>

Signed-off-by: Rupal Mahajan <[email protected]>

* add group = org.opensearch.plugin (#506) (#507)

Signed-off-by: prudhvigodithi <[email protected]>

Signed-off-by: prudhvigodithi <[email protected]>
(cherry picked from commit b25984b)

Co-authored-by: Prudhvi Godithi <[email protected]>

* feat: enable windows and macos build (#504) (#511)

Signed-off-by: Derek Ho <[email protected]>

* Update version for jsdom, terser and jsoup (#515)

Signed-off-by: Rupal Mahajan <[email protected]>

* Fix snakeyaml vulnerability issue by disabling detekt (#517)

Signed-off-by: Rupal Mahajan <[email protected]>

* Update ktlint version (#519)

Signed-off-by: Rupal Mahajan <[email protected]>

* Upgrade minimatch, moment (#513)

Signed-off-by: Rupal Mahajan <[email protected]>

* Revert detekt changes with upgraded version 1.21.0 (#527)

Signed-off-by: Rupal Mahajan <[email protected]>

Signed-off-by: Rupal Mahajan <[email protected]>

* Add loader-utils to resolutions (#525)

Signed-off-by: Rupal Mahajan <[email protected]>

Signed-off-by: Rupal Mahajan <[email protected]>

* Nit: add resolutions at once place (#529) (#530)

Signed-off-by: Rupal Mahajan <[email protected]>

Signed-off-by: Rupal Mahajan <[email protected]>
(cherry picked from commit 0dada24)

Co-authored-by: Rupal Mahajan <[email protected]>

* add release notes for 2.4.0.0 (#532) (#533)

Signed-off-by: Rupal Mahajan <[email protected]>

Signed-off-by: Rupal Mahajan <[email protected]>
(cherry picked from commit a1c4839)

Co-authored-by: Rupal Mahajan <[email protected]>

* Bump loader-utils from 2.0.3 to 2.0.4 in /dashboards-reports (#539) (#541)

Bumps [loader-utils](https://github.com/webpack/loader-utils) from 2.0.3 to 2.0.4.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v2.0.4/CHANGELOG.md)
- [Commits](webpack/loader-utils@v2.0.3...v2.0.4)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit f250deb)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* update qs 6.5.3 (#545)

Signed-off-by: Rupal Mahajan <[email protected]>

Signed-off-by: Rupal Mahajan <[email protected]>

* Fix metrics tests and ClassNotFoundException when calling stats API (#546)

Signed-off-by: Joshua Li <[email protected]>

* Use advanced settings for leading wildcards in query for csv reports (#549)

* Fetch allowLeadingWildcards from config

Signed-off-by: Rupal Mahajan <[email protected]>

* Fix tests

Signed-off-by: Rupal Mahajan <[email protected]>

* nit

Signed-off-by: Rupal Mahajan <[email protected]>

* add default value for allowLeadingWildCards

Co-authored-by: Joshua Li <[email protected]>
Signed-off-by: Rupal Mahajan <[email protected]>

Signed-off-by: Rupal Mahajan <[email protected]>
Co-authored-by: Joshua Li <[email protected]>

* Increment version to 2.5.0-SNAPSHOT (#528)

Signed-off-by: opensearch-ci-bot <[email protected]>

Signed-off-by: opensearch-ci-bot <[email protected]>
Co-authored-by: opensearch-ci-bot <[email protected]>

* [1.x] Upgrade decode-uri-component (#558) (#560)

* upgrade loader-utils for CVE-2022-37601

Signed-off-by: Rupal Mahajan <[email protected]>

* Update async for CVE-2021-43138

Signed-off-by: Rupal Mahajan <[email protected]>

* Fix cross-fetch for CVE-2022-1365

Signed-off-by: Rupal Mahajan <[email protected]>

* Fix for CVE-2022-37599, CVE-2022-37603

Signed-off-by: Rupal Mahajan <[email protected]>

* Update terser for CVE-2022-25858

Signed-off-by: Rupal Mahajan <[email protected]>

* Update minimatch for CVE-2022-3517

Signed-off-by: Rupal Mahajan <[email protected]>

* Update moment for CVE-2022-24785

Signed-off-by: Rupal Mahajan <[email protected]>

* Update jsdom for CVE-2021-20066

Signed-off-by: Rupal Mahajan <[email protected]>

* Update execa for GMS-2020-2

Signed-off-by: Rupal Mahajan <[email protected]>

* Update qs for CVE-2022-24999

Signed-off-by: Rupal Mahajan <[email protected]>

* Update moment for CVE-2022-31129

Signed-off-by: Rupal Mahajan <[email protected]>

* Update decode-uri-component for CVE-2022-38900

Signed-off-by: Rupal Mahajan <[email protected]>

Signed-off-by: Rupal Mahajan <[email protected]>
(cherry picked from commit d3f36b5)

Co-authored-by: Rupal Mahajan <[email protected]>

* Fix windows and macos CI (#569) (#571)

* Update windows & mac CI for reo name change

Signed-off-by: Rupal Mahajan <[email protected]>

* Fix linux build

Signed-off-by: Rupal Mahajan <[email protected]>

Signed-off-by: Rupal Mahajan <[email protected]>
(cherry picked from commit 9ce8684)

Co-authored-by: Rupal Mahajan <[email protected]>

* Add ERR_ADDRESS_INVALID in Troubleshooting (#574)

* Add workaround for ERR_ADDRESS_INVALID in doc

Signed-off-by: Rupal Mahajan <[email protected]>

* nit

Signed-off-by: Rupal Mahajan <[email protected]>

Signed-off-by: Rupal Mahajan <[email protected]>

* Add release notes for 2.4.1 (#580)

Signed-off-by: Rupal Mahajan <[email protected]>

Signed-off-by: Rupal Mahajan <[email protected]>

* Remove jackson-databind and jackson-annotations (#587)

* Remove jackson-databind and jackson-annotations dependencies

Signed-off-by: Rupal Mahajan <[email protected]>

* resolve dompurify conflicting dependencies

Signed-off-by: Rupal Mahajan <[email protected]>

* fix build

Signed-off-by: Rupal Mahajan <[email protected]>

Signed-off-by: Rupal Mahajan <[email protected]>

* Use front-end report generation instead of chromium (#586)

* Increment version to 2.4.1-SNAPSHOT (#540)

Signed-off-by: opensearch-ci-bot <[email protected]>

Signed-off-by: opensearch-ci-bot <[email protected]>
Co-authored-by: opensearch-ci-bot <[email protected]>

* --wip--

Signed-off-by: Joshua Li <[email protected]>

* Add initial implementation of client reporting generation

Signed-off-by: Joshua Li <[email protected]>

* Fix url with basepath

Signed-off-by: Joshua Li <[email protected]>

* Update header footer height

Signed-off-by: Joshua Li <[email protected]>

* Update dialog text to not close dialog

Signed-off-by: Joshua Li <[email protected]>

* Remove console.log

Signed-off-by: Joshua Li <[email protected]>

* Remove unused components

Signed-off-by: Joshua Li <[email protected]>

* Remove chromium references

Signed-off-by: Joshua Li <[email protected]>

* Add report generation error handling

Signed-off-by: Joshua Li <[email protected]>

* Minor refactors

Signed-off-by: Joshua Li <[email protected]>

* Add postinstall patch to support safari for html2canvas

Signed-off-by: Joshua Li <[email protected]>

* Add dompurify

Signed-off-by: Joshua Li <[email protected]>

* Fix build error

Signed-off-by: Joshua Li <[email protected]>

* Remove chromium from CI

Signed-off-by: Joshua Li <[email protected]>

* Update CI artifact name

Signed-off-by: Joshua Li <[email protected]>

Signed-off-by: opensearch-ci-bot <[email protected]>
Signed-off-by: Joshua Li <[email protected]>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: opensearch-ci-bot <[email protected]>

* Remove front end code (#620)

* Remove frontend code

Signed-off-by: Rupal Mahajan <[email protected]>

* Move one level up

Signed-off-by: Rupal Mahajan <[email protected]>

* Update workflow file

Signed-off-by: Rupal Mahajan <[email protected]>

* nit: remove dashboard setup from readme

Signed-off-by: Rupal Mahajan <[email protected]>

Signed-off-by: Rupal Mahajan <[email protected]>

* Remove unnecessary scripts after repo split (#622)

Signed-off-by: Joshua Li <[email protected]>

* Include integration tests in windows workflow (#624)

Signed-off-by: Rupal Mahajan <[email protected]>

Signed-off-by: Rupal Mahajan <[email protected]>

* Add release notes for 2.5.0.0 (#628)

* Add release notes for 2.5.0.0

Signed-off-by: Rupal Mahajan <[email protected]>

* Fix version in release notes

Signed-off-by: Rupal Mahajan <[email protected]>

Signed-off-by: Rupal Mahajan <[email protected]>

* Increment version to 2.6.0 (#636)

Signed-off-by: Rupal Mahajan <[email protected]>

* Updated MAINTAINERS.md to match recommended opensearch-project format. (#619) (#635)

Signed-off-by: dblock <[email protected]>

Signed-off-by: dblock <[email protected]>
(cherry picked from commit 8e1cdad)

Co-authored-by: Daniel (dB.) Doubrovkine <[email protected]>

* [Backport 2.x] Add jackson-databind and jackson-annotations (#652)

* Add jackson-databind and jackson-annotations (#650)

Signed-off-by: Rupal Mahajan <[email protected]>
(cherry picked from commit cc34ae8)

* Resolve mockito-core conflict

Signed-off-by: Rupal Mahajan <[email protected]>

---------

Signed-off-by: Rupal Mahajan <[email protected]>
Co-authored-by: Rupal Mahajan <[email protected]>

* Add publish to maven workflow (#651) (#655)

Signed-off-by: Rupal Mahajan <[email protected]>
(cherry picked from commit 1c7a917)

Co-authored-by: Rupal Mahajan <[email protected]>

* fix maven publish workflow (#665) (#666)

* fix maven publish workflow

Signed-off-by: Derek Ho <[email protected]>

* remove bracket

Signed-off-by: Derek Ho <[email protected]>

* fix branch names

Signed-off-by: Derek Ho <[email protected]>

* stringify 1.3

Signed-off-by: Derek Ho <[email protected]>

---------

Signed-off-by: Derek Ho <[email protected]>
(cherry picked from commit 354f44a)

Co-authored-by: Derek Ho <[email protected]>

* Increment version to 2.7.0-SNAPSHOT (#657)

Signed-off-by: opensearch-ci-bot <[email protected]>
Co-authored-by: opensearch-ci-bot <[email protected]>

* Merge pull request #656 from rupal-bq/release-notes-2.6.0 (#659)

Add release notes for 2.6.0

(cherry picked from commit 6c1b03e)
Signed-off-by: Derek Ho <[email protected]>

Co-authored-by: Eric Wei <[email protected]>

* Bump snakeyaml to 2.0 (#674)

Signed-off-by: Joshua Li <[email protected]>
(cherry picked from commit b792396)

* upgrade mockito-core (#678) (#679)

Signed-off-by: Rupal Mahajan <[email protected]>
(cherry picked from commit 14ecd44)

Co-authored-by: Rupal Mahajan <[email protected]>

* [Backport 2.x] Fix ci failures (#681)

* Fix ci failures (#662)

Signed-off-by: Yury-Fridlyand <[email protected]>
(cherry picked from commit 07956f7)

* Pull Job scheduler from maven instead of jenkins (#663)

* use maven

Signed-off-by: Derek Ho <[email protected]>

* bwc version to 2.7.0 bump

Signed-off-by: Derek Ho <[email protected]>

* hard code zips

Signed-off-by: Derek Ho <[email protected]>

---------

Signed-off-by: Derek Ho <[email protected]>
Signed-off-by: Rupal Mahajan <[email protected]>

---------

Signed-off-by: Derek Ho <[email protected]>
Signed-off-by: Rupal Mahajan <[email protected]>
Co-authored-by: Yury-Fridlyand <[email protected]>
Co-authored-by: Derek Ho <[email protected]>

* Add release notes for 2.7 (#684) (#686)

Signed-off-by: Rupal Mahajan <[email protected]>
(cherry picked from commit 8fafd72)

Co-authored-by: Rupal Mahajan <[email protected]>

* Update json version to 20230227 (#692)

Signed-off-by: Rupal Mahajan <[email protected]>

* Update Gradle Wrapper to 7.6.1 (#689) (#695)

Signed-off-by: Daniel Widdis <[email protected]>
(cherry picked from commit ebbb54d)

Co-authored-by: Daniel Widdis <[email protected]>

* Increment version to 2.8.0-SNAPSHOT (#688)

Signed-off-by: opensearch-ci-bot <[email protected]>
Co-authored-by: opensearch-ci-bot <[email protected]>

* Add release notes for 2.8 (#705) (#706)

Signed-off-by: Joshua Li <[email protected]>
(cherry picked from commit f27cdd4)

Co-authored-by: Joshua Li <[email protected]>

* Removing guava dependency to fix jarhell (#709) (#710)

* removing guava to fix jarhell

Signed-off-by: Shenoy Pratik <[email protected]>

* update release notes

Signed-off-by: Shenoy Pratik <[email protected]>

---------

Signed-off-by: Shenoy Pratik <[email protected]>
(cherry picked from commit d7ff8cd)

Co-authored-by: Shenoy Pratik <[email protected]>

* Increment version to 2.9.0-SNAPSHOT

Signed-off-by: opensearch-ci-bot <[email protected]>

* Add 2.9 release notes (#723) (#724)

Signed-off-by: Kavitha Conjeevaram Mohan <[email protected]>
(cherry picked from commit 79a385b)

Co-authored-by: Kavitha Conjeevaram Mohan <[email protected]>

* fix ci

Signed-off-by: Derek Ho <[email protected]>

* update kotlin version

Signed-off-by: Derek Ho <[email protected]>

* update build.gradle

Signed-off-by: Derek Ho <[email protected]>

* ktlint

Signed-off-by: Derek Ho <[email protected]>

* version bump

Signed-off-by: Derek Ho <[email protected]>

* update workflow

Signed-off-by: Derek Ho <[email protected]>

* fix imports in tests

Signed-off-by: Derek Ho <[email protected]>

* update import from upstream breaking changes

Signed-off-by: Derek Ho <[email protected]>

* Merge pull request #748 from derek-ho/insights

fix from upstream import changes

(cherry picked from commit c254aad)
Signed-off-by: Derek Ho <[email protected]>

* Update PluginBaseAction.kt

Remove duplicate import

Signed-off-by: Derek Ho <[email protected]>

* Update backport CI, add PR merged condition (#750)

Signed-off-by: Shenoy Pratik <[email protected]>

* Add 2.10 release notes (#758) (#759)

(cherry picked from commit 6a93631)

Signed-off-by: Rupal Mahajan <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* Increment version to 2.11.0-SNAPSHOT (#756)

Signed-off-by: opensearch-ci-bot <[email protected]>
Co-authored-by: opensearch-ci-bot <[email protected]>

* Updates demo certs used in integ tests (#755) (#757)

(cherry picked from commit 3d17d50)

Signed-off-by: Darshit Chanpura <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* Increment version to 2.12.0-SNAPSHOT (#871)

Signed-off-by: opensearch-ci-bot <[email protected]>
Co-authored-by: opensearch-ci-bot <[email protected]>

* Upgrade JSON to 20231013 to fix CVE-2023-5072 (#912) (#914)

(cherry picked from commit b68990f)

Signed-off-by: Derek Ho <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* Onboard jenkins prod docker images to github actions (#924)

Signed-off-by: Peter Zhu <[email protected]>

---------

Signed-off-by: vamsi-amazon <[email protected]>
Signed-off-by: Joshua Li <[email protected]>
Signed-off-by: opensearch-ci-bot <[email protected]>
Signed-off-by: Eric Wei <[email protected]>
Signed-off-by: Rupal Mahajan <[email protected]>
Signed-off-by: Derek Ho <[email protected]>
Signed-off-by: Shenoy Pratik <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Darshit Chanpura <[email protected]>
Signed-off-by: Peter Zhu <[email protected]>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Shenoy Pratik <[email protected]>
Co-authored-by: vamsi-amazon <[email protected]>
Co-authored-by: Joshua Li <[email protected]>
Co-authored-by: opensearch-ci-bot <[email protected]>
Co-authored-by: Prudhvi Godithi <[email protected]>
Co-authored-by: Eric Wei <[email protected]>
Co-authored-by: Rupal <[email protected]>
Co-authored-by: Derek Ho <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Daniel (dB.) Doubrovkine <[email protected]>
Co-authored-by: Derek Ho <[email protected]>
Co-authored-by: Yury-Fridlyand <[email protected]>
Co-authored-by: Daniel Widdis <[email protected]>
Co-authored-by: Kavitha Conjeevaram Mohan <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.x failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/reporting/backport-1.x 1.x
# Navigate to the new working tree
pushd ../.worktrees/reporting/backport-1.x
# Create a new branch
git switch --create backport/backport-912-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b68990fed59814832800affed06e5aa4439f0918
# Push it to GitHub
git push --set-upstream origin backport/backport-912-to-1.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/reporting/backport-1.x

Then, create a pull request where the base branch is 1.x and the compare/head branch is backport/backport-912-to-1.x.

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.

5 participants