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(venv): fix compatibility on Bash 4.x and sync changes from EE #13704

Merged
merged 2 commits into from
Sep 29, 2024

Conversation

fffonion
Copy link
Contributor

@fffonion fffonion commented Sep 24, 2024

Summary

Checklist

  • The Pull Request has tests
  • A changelog file has been created under changelog/unreleased/kong or skip-changelog label added on PR if changelog is unnecessary. README.md
  • There is a user-facing docs PR against https://github.com/Kong/docs.konghq.com - PUT DOCS PR HERE

Issue reference

Bash 3 is the default shell on macOS it seems

https://github.com/Kong/kong-ee/pull/10323

@github-actions github-actions bot added the cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee label Sep 24, 2024
@team-gateway-bot team-gateway-bot added the author/community PRs from the open-source community (not Kong Inc) label Sep 24, 2024
@fffonion fffonion removed the cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee label Sep 29, 2024
@github-actions github-actions bot added the cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee label Sep 29, 2024
@fffonion fffonion merged commit 695e8ec into master Sep 29, 2024
25 checks passed
@fffonion fffonion deleted the fix-bash4 branch September 29, 2024 08:35
@team-gateway-bot
Copy link
Collaborator

Cherry-pick failed for master, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git remote add upstream https://github.com/kong/kong-ee
git fetch upstream master
git worktree add -d .worktree/cherry-pick-13704-to-master-to-upstream upstream/master
cd .worktree/cherry-pick-13704-to-master-to-upstream
git checkout -b cherry-pick-13704-to-master-to-upstream
ancref=$(git merge-base 8210e880c603186eff8154c731bb392d1413f3fa 293fca78a5f4952a39ef6cb75fc6c22e1a4c16c5)
git cherry-pick -x $ancref..293fca78a5f4952a39ef6cb75fc6c22e1a4c16c5

@github-actions github-actions bot added the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label Sep 29, 2024
@ADD-SP
Copy link
Contributor

ADD-SP commented Sep 29, 2024

Manually cherry-pick: https://github.com/Kong/kong-ee/pull/10323

@ADD-SP ADD-SP removed the author/community PRs from the open-source community (not Kong Inc) label Sep 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention size/L skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants