Resolve windows opensearch-env.bat having variable delayed expansion issues on OPENSEARCH_HOME assignment introduced in #6956#7080
Merged
peterzhuamazon merged 3 commits intoopensearch-project:mainfrom Apr 11, 2023
Conversation
Contributor
Gradle Check (Jenkins) Run Completed with:
|
This was referenced Apr 10, 2023
…issues on OPENSEARCH_HOME assignment Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
560be68 to
1a1d678
Compare
Member
Author
|
Hi @andrross I have resolved the changelog comment you mentioned. |
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
5 tasks
5 tasks
andrross
approved these changes
Apr 11, 2023
Contributor
Gradle Check (Jenkins) Run Completed with:
|
Contributor
Gradle Check (Jenkins) Run Completed with:
|
Contributor
Gradle Check (Jenkins) Run Completed with:
|
Contributor
Gradle Check (Jenkins) Run Completed with:
|
DarshitChanpura
approved these changes
Apr 11, 2023
Member
DarshitChanpura
left a comment
There was a problem hiding this comment.
This will hopefully solve Windows CI woes across plugins. Ty @peterzhuamazon !!
Contributor
|
The backport to 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-1.x 1.x
# Navigate to the new working tree
pushd ../.worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-7080-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 810b98555ea612cbae8310bf670cd515eb8cab34
# Push it to GitHub
git push --set-upstream origin backport/backport-7080-to-1.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-1.xThen, create a pull request where the |
Contributor
|
The backport to 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.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-7080-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 810b98555ea612cbae8310bf670cd515eb8cab34
# Push it to GitHub
git push --set-upstream origin backport/backport-7080-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.xThen, create a pull request where the |
Member
Author
|
Will create backports of this soon. |
Member
Author
|
It merged now. |
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Apr 11, 2023
…issues on OPENSEARCH_HOME assignment introduced in #6956 (#7080) * Resolve windows opensearch-env.bat having variable delayed expansion issues on OPENSEARCH_HOME assignment Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Remove changelog entry Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> --------- Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> (cherry picked from commit 810b985) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
peterzhuamazon
pushed a commit
that referenced
this pull request
Apr 11, 2023
…issues on OPENSEARCH_HOME assignment introduced in #6956 (#7080) (#7109) * Resolve windows opensearch-env.bat having variable delayed expansion issues on OPENSEARCH_HOME assignment * Remove changelog entry --------- (cherry picked from commit 810b985) Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> 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>
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Apr 11, 2023
…issues on OPENSEARCH_HOME assignment introduced in #6956 (#7080) * Resolve windows opensearch-env.bat having variable delayed expansion issues on OPENSEARCH_HOME assignment Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Remove changelog entry Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> --------- Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> (cherry picked from commit 810b985) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
peterzhuamazon
pushed a commit
that referenced
this pull request
Apr 11, 2023
…issues on OPENSEARCH_HOME assignment introduced in #6956 (#7080) (#7111) * Resolve windows opensearch-env.bat having variable delayed expansion issues on OPENSEARCH_HOME assignment * Remove changelog entry --------- (cherry picked from commit 810b985) Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> 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>
austintlee
pushed a commit
to austintlee/OpenSearch
that referenced
this pull request
Apr 28, 2023
…issues on OPENSEARCH_HOME assignment introduced in opensearch-project#6956 (opensearch-project#7080) * Resolve windows opensearch-env.bat having variable delayed expansion issues on OPENSEARCH_HOME assignment Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Remove changelog entry Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> --------- Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Resolve windows opensearch-env.bat having variable delayed expansion issues on OPENSEARCH_HOME assignment introduced in #6956
Issues Resolved
#6956 (comment)
opensearch-project/security#2657
Check List
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.