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 the Maven publish #379

Merged
merged 1 commit into from
May 8, 2023
Merged

Conversation

prudhvigodithi
Copy link
Member

@prudhvigodithi prudhvigodithi commented May 6, 2023

Description

Fixes the JS, JS-SPI and JS plugin zip maven publication.

Issues Resolved

#374
#377 (comment)

Testing Output:

For testing purposes I have used url 'file://Users/pgodithi/.m2/repository' for Snapshots Repo

For JS-SPI

./gradlew publishShadowPublicationToSnapshotsRepository
Picked up JAVA_TOOL_OPTIONS: -Dlog4j2.formatMsgNoLookups=true
=======================================
OpenSearch Build Hamster says Hello!
  Gradle Version        : 8.0.2
  OS Info               : Mac OS X 13.3.1 (aarch64)
  JDK Version           : 11 (Homebrew JDK)
  JAVA_HOME             : /opt/homebrew/Cellar/openjdk@11/11.0.16.1/libexec/openjdk.jdk/Contents/Home
  Random Testing Seed   : 259E5FD293BAE552
  In FIPS 140 mode      : false
=======================================

> Task :opensearch-job-scheduler-spi:publishShadowPublicationToSnapshotsRepository
file:/Users/pgodithi/.m2/repository//org/opensearch/opensearch-job-scheduler-spi/3.0.0.0-SNAPSHOT/opensearch-job-scheduler-spi.jar
file:/Users/pgodithi/.m2/repository//org/opensearch/opensearch-job-scheduler-spi/3.0.0.0-SNAPSHOT/opensearch-job-scheduler-spi-sources.jar
file:/Users/pgodithi/.m2/repository//org/opensearch/opensearch-job-scheduler-spi/3.0.0.0-SNAPSHOT/opensearch-job-scheduler-spi-javadoc.jar

Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0.

You can use '--warning-mode all' to show the individual deprecation warnings and determine if they come from your own scripts or plugins.

See https://docs.gradle.org/8.0.2/userguide/command_line_interface.html#sec:command_line_warnings

BUILD SUCCESSFUL in 1s
8 actionable tasks: 2 executed, 6 up-to-date

For JS

./gradlew publishNebulaPublicationToSnapshotsRepository
Picked up JAVA_TOOL_OPTIONS: -Dlog4j2.formatMsgNoLookups=true
=======================================
OpenSearch Build Hamster says Hello!
  Gradle Version        : 8.0.2
  OS Info               : Mac OS X 13.3.1 (aarch64)
  JDK Version           : 11 (Homebrew JDK)
  JAVA_HOME             : /opt/homebrew/Cellar/openjdk@11/11.0.16.1/libexec/openjdk.jdk/Contents/Home
  Random Testing Seed   : 8CC5B5F3E22974FD
  In FIPS 140 mode      : false
=======================================

> Task :compileJava
Note: /Users/pgodithi/git/job-scheduler/src/main/java/org/opensearch/jobscheduler/JobSchedulerPlugin.java uses unchecked or unsafe operations.
Note: Recompile with -Xlint:unchecked for details.

> Task :javadoc
Picked up JAVA_TOOL_OPTIONS: -Dlog4j2.formatMsgNoLookups=true

> Task :publishNebulaPublicationToSnapshotsRepository
file:/Users/pgodithi/.m2/repository//org/opensearch/opensearch-job-scheduler/3.0.0.0-SNAPSHOT/opensearch-job-scheduler-sources.jar
file:/Users/pgodithi/.m2/repository//org/opensearch/opensearch-job-scheduler/3.0.0.0-SNAPSHOT/opensearch-job-scheduler-javadoc.jar
file:/Users/pgodithi/.m2/repository//org/opensearch/opensearch-job-scheduler/3.0.0.0-SNAPSHOT/opensearch-job-scheduler.jar

Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0.

You can use '--warning-mode all' to show the individual deprecation warnings and determine if they come from your own scripts or plugins.

See https://docs.gradle.org/8.0.2/userguide/command_line_interface.html#sec:command_line_warnings

BUILD SUCCESSFUL in 2s
12 actionable tasks: 9 executed, 3 up-to-date

For JS plugin zip

./gradlew publishPluginZipPublicationToSnapshotsRepository 
Picked up JAVA_TOOL_OPTIONS: -Dlog4j2.formatMsgNoLookups=true
=======================================
OpenSearch Build Hamster says Hello!
  Gradle Version        : 8.0.2
  OS Info               : Mac OS X 13.3.1 (aarch64)
  JDK Version           : 11 (Homebrew JDK)
  JAVA_HOME             : /opt/homebrew/Cellar/openjdk@11/11.0.16.1/libexec/openjdk.jdk/Contents/Home
  Random Testing Seed   : 6D40A80242B82066
  In FIPS 140 mode      : false
=======================================

> Task :publishPluginZipPublicationToSnapshotsRepository
file:/Users/pgodithi/.m2/repository//org/opensearch/plugin/opensearch-job-scheduler/3.0.0.0-SNAPSHOT/opensearch-job-scheduler.zip

Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0.

You can use '--warning-mode all' to show the individual deprecation warnings and determine if they come from your own scripts or plugins.

See https://docs.gradle.org/8.0.2/userguide/command_line_interface.html#sec:command_line_warnings

BUILD SUCCESSFUL in 724ms
12 actionable tasks: 6 executed, 6 up-to-date

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc 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.

@prudhvigodithi
Copy link
Member Author

prudhvigodithi commented May 6, 2023

Hey @vibrantvarun @cwperks can you please review? this should fix the issue that we see with JS maven publish.
#374
#377 (comment)
@bbarani @gaiksaya @peterzhuamazon @owaiskazi19

Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com>
@codecov-commenter
Copy link

Codecov Report

Merging #379 (ed82135) into main (db8edff) will decrease coverage by 0.09%.
The diff coverage is n/a.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@             Coverage Diff              @@
##               main     #379      +/-   ##
============================================
- Coverage     28.77%   28.69%   -0.09%     
+ Complexity       97       96       -1     
============================================
  Files            22       22              
  Lines          1178     1178              
  Branches        109      109              
============================================
- Hits            339      338       -1     
  Misses          818      818              
- Partials         21       22       +1     

see 1 file with indirect coverage changes

@cwperks
Copy link
Member

cwperks commented May 6, 2023

Hi @prudhvigodithi, thank you for raising this PR! It looks like the pluginJar publication I introduced was actually duplicating work of the nebula publication which was actually publishing the jar file to org.opensearch.opensearch-job-scheduler. The pluginJar publication was the reason for having 2 build numbers where one published the jar and the other did not, but only included the pom files. It was present in this comment from the last PR, but I didn't notice there were multiple sets of files either ending in -1 or -2 in org.opensearch.opensearch-job-scheduler.

I see that this reintroduces startParameter.excludedTaskNames=["publishPluginZipPublicationToMavenLocal", "publishPluginZipPublicationToStagingRepository"] which is added to get around failures during ./gradlew publishToMavenLocal right? I created a PR against my fork which removes the pluginJar publication to resolve the issue of the jar not being published on the latest builder number: cwperks#1

@prudhvigodithi
Copy link
Member Author

Hey @cwperks thanks for checking, this PR targets removing all the code added that will hijack the task dependencies, adding task dependencies on the fly in build.gradle during runtime might impact any future added tasks and later we need to manipulate the task dependencies back again. Also you are right the excludedTaskNames are added as before and I dont see a problem having them there because with PluginZipPublication zips does not act as dependencies to any other jars/zips, all the purpose of this PluginZipPublication is to get zips published to central maven (from user local staging repo which is handled by the custom plugin).

@cwperks
Copy link
Member

cwperks commented May 8, 2023

@prudhvigodithi Thank you for the explanation. I'm not sure what changed in gradle 8 that made the ./gradlew publishAllPublicationsToSnapshotsRepository start failing. See this comment from the original gradle 8 upgrade PR which shows the error: #348 (comment)

If we can use other commands in place of a single command to publish all artifacts than that sounds fine to me.

@vibrantvarun
Copy link
Member

Testing on my local machine.
Will post the results below

@vibrantvarun
Copy link
Member

Hey @prudhvigodithi facing below error while testing on my local machine

./gradlew publishShadowPublicationToSnapshotsRepository && ./gradlew publishNebulaPublicationToSnapshotsRepository && ./gradlew publishPluginZipPublicationToSnapshotsRepository
Starting a Gradle Daemon (subsequent builds will be faster)

FAILURE: Build failed with an exception.

* What went wrong:
A problem occurred configuring root project 'opensearch-job-scheduler'.
> java.util.concurrent.ExecutionException: org.gradle.api.GradleException: Failed to create Jar file /Users/varunudr/.gradle/caches/jars-9/94ac7eb5f0b504d7e3b47bc2eec907cc/jackson-core-2.15.0.jar.

* Try:
> Run with --stacktrace option to get the stack trace.
> Run with --info or --debug option to get more log output.
> Run with --scan to get full insights.

* Get more help at https://help.gradle.org

BUILD FAILED in 13s

@prudhvigodithi
Copy link
Member Author

Thanks @vibrantvarun that error does not look like the error related to this PR? (Did not throw in the CI checks as well) @cwperks can you also please test on your local once ?

@vibrantvarun
Copy link
Member

tree snapshots 
snapshots
└── org
    └── opensearch
        ├── opensearch-job-scheduler
        │   ├── 3.0.0.0-SNAPSHOT
        │   │   ├── maven-metadata.xml
        │   │   ├── maven-metadata.xml.md5
        │   │   ├── maven-metadata.xml.sha1
        │   │   ├── maven-metadata.xml.sha256
        │   │   ├── maven-metadata.xml.sha512
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163000-1-javadoc.jar
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163000-1-javadoc.jar.md5
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163000-1-javadoc.jar.sha1
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163000-1-javadoc.jar.sha256
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163000-1-javadoc.jar.sha512
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163000-1-sources.jar
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163000-1-sources.jar.md5
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163000-1-sources.jar.sha1
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163000-1-sources.jar.sha256
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163000-1-sources.jar.sha512
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163000-1.jar
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163000-1.jar.md5
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163000-1.jar.sha1
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163000-1.jar.sha256
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163000-1.jar.sha512
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163000-1.module
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163000-1.module.md5
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163000-1.module.sha1
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163000-1.module.sha256
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163000-1.module.sha512
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163000-1.pom
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163000-1.pom.md5
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163000-1.pom.sha1
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163000-1.pom.sha256
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163000-1.pom.sha512
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163053-2-javadoc.jar
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163053-2-javadoc.jar.md5
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163053-2-javadoc.jar.sha1
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163053-2-javadoc.jar.sha256
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163053-2-javadoc.jar.sha512
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163053-2-sources.jar
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163053-2-sources.jar.md5
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163053-2-sources.jar.sha1
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163053-2-sources.jar.sha256
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163053-2-sources.jar.sha512
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163053-2.jar
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163053-2.jar.md5
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163053-2.jar.sha1
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163053-2.jar.sha256
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163053-2.jar.sha512
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163053-2.module
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163053-2.module.md5
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163053-2.module.sha1
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163053-2.module.sha256
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163053-2.module.sha512
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163053-2.pom
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163053-2.pom.md5
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163053-2.pom.sha1
        │   │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163053-2.pom.sha256
        │   │   └── opensearch-job-scheduler-3.0.0.0-20230508.163053-2.pom.sha512
        │   ├── maven-metadata.xml
        │   ├── maven-metadata.xml.md5
        │   ├── maven-metadata.xml.sha1
        │   ├── maven-metadata.xml.sha256
        │   └── maven-metadata.xml.sha512
        ├── opensearch-job-scheduler-spi
        │   ├── 3.0.0.0-SNAPSHOT
        │   │   ├── maven-metadata.xml
        │   │   ├── maven-metadata.xml.md5
        │   │   ├── maven-metadata.xml.sha1
        │   │   ├── maven-metadata.xml.sha256
        │   │   ├── maven-metadata.xml.sha512
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.162958-1-javadoc.jar
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.162958-1-javadoc.jar.md5
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.162958-1-javadoc.jar.sha1
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.162958-1-javadoc.jar.sha256
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.162958-1-javadoc.jar.sha512
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.162958-1-sources.jar
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.162958-1-sources.jar.md5
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.162958-1-sources.jar.sha1
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.162958-1-sources.jar.sha256
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.162958-1-sources.jar.sha512
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.162958-1.jar
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.162958-1.jar.md5
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.162958-1.jar.sha1
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.162958-1.jar.sha256
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.162958-1.jar.sha512
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.162958-1.pom
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.162958-1.pom.md5
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.162958-1.pom.sha1
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.162958-1.pom.sha256
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.162958-1.pom.sha512
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.163051-2-javadoc.jar
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.163051-2-javadoc.jar.md5
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.163051-2-javadoc.jar.sha1
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.163051-2-javadoc.jar.sha256
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.163051-2-javadoc.jar.sha512
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.163051-2-sources.jar
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.163051-2-sources.jar.md5
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.163051-2-sources.jar.sha1
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.163051-2-sources.jar.sha256
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.163051-2-sources.jar.sha512
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.163051-2.jar
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.163051-2.jar.md5
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.163051-2.jar.sha1
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.163051-2.jar.sha256
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.163051-2.jar.sha512
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.163051-2.pom
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.163051-2.pom.md5
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.163051-2.pom.sha1
        │   │   ├── opensearch-job-scheduler-spi-3.0.0.0-20230508.163051-2.pom.sha256
        │   │   └── opensearch-job-scheduler-spi-3.0.0.0-20230508.163051-2.pom.sha512
        │   ├── maven-metadata.xml
        │   ├── maven-metadata.xml.md5
        │   ├── maven-metadata.xml.sha1
        │   ├── maven-metadata.xml.sha256
        │   └── maven-metadata.xml.sha512
        └── plugin
            └── opensearch-job-scheduler
                ├── 3.0.0.0-SNAPSHOT
                │   ├── maven-metadata.xml
                │   ├── maven-metadata.xml.md5
                │   ├── maven-metadata.xml.sha1
                │   ├── maven-metadata.xml.sha256
                │   ├── maven-metadata.xml.sha512
                │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163002-1.pom
                │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163002-1.pom.md5
                │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163002-1.pom.sha1
                │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163002-1.pom.sha256
                │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163002-1.pom.sha512
                │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163002-1.zip
                │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163002-1.zip.md5
                │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163002-1.zip.sha1
                │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163002-1.zip.sha256
                │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163002-1.zip.sha512
                │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163055-2.pom
                │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163055-2.pom.md5
                │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163055-2.pom.sha1
                │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163055-2.pom.sha256
                │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163055-2.pom.sha512
                │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163055-2.zip
                │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163055-2.zip.md5
                │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163055-2.zip.sha1
                │   ├── opensearch-job-scheduler-3.0.0.0-20230508.163055-2.zip.sha256
                │   └── opensearch-job-scheduler-3.0.0.0-20230508.163055-2.zip.sha512
                ├── maven-metadata.xml
                ├── maven-metadata.xml.md5
                ├── maven-metadata.xml.sha1
                ├── maven-metadata.xml.sha256
                └── maven-metadata.xml.sha512

@cwperks
Copy link
Member

cwperks commented May 8, 2023

@prudhvigodithi I do not receive that error on my local machine. @vibrantvarun did you have any issues when checking out Prudvhi's branch that prevented the switching to the branch?

Copy link
Member

@vibrantvarun vibrantvarun left a comment

Choose a reason for hiding this comment

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

LGTM. Tested on my machine. Thanks @prudhvigodithi

@joshpalis joshpalis merged commit 946b0ca into opensearch-project:main May 8, 2023
opensearch-trigger-bot bot pushed a commit that referenced this pull request May 8, 2023
Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com>
(cherry picked from commit 946b0ca)
vibrantvarun pushed a commit that referenced this pull request May 8, 2023
Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com>
(cherry picked from commit 946b0ca)

Co-authored-by: Prudhvi Godithi <pgodithi@amazon.com>
@prudhvigodithi prudhvigodithi added the backport 2.7 backport 2.7 label May 9, 2023
@opensearch-trigger-bot
Copy link

The backport to 2.7 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-2.7 2.7
# Navigate to the new working tree
cd .worktrees/backport-2.7
# Create a new branch
git switch --create backport/backport-379-to-2.7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 946b0cafecda71bd5b19220a67a1e61af6081382
# Push it to GitHub
git push --set-upstream origin backport/backport-379-to-2.7
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.7

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants