Skip to content

Conversation

@JoshMock
Copy link
Member

Borrowed largely from elastic/elasticsearch-serverless-js#38.

Also updated some metadata and pipeline configs to test the correct branches.

@JoshMock JoshMock merged commit 4aaf49b into main Dec 14, 2023
@JoshMock JoshMock deleted the integration-improvements branch December 14, 2023 22:35
@github-actions
Copy link
Contributor

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

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

github-actions bot pushed a commit that referenced this pull request Dec 14, 2023
* Improvements to integrations

Borrowed largely from elastic/elasticsearch-serverless-js#38

* Bump all the things to 8.12.0

* Split Dockerfile copy into two layers

* Fix test cron names

(cherry picked from commit 4aaf49b)
JoshMock added a commit that referenced this pull request Dec 14, 2023
JoshMock added a commit that referenced this pull request Dec 14, 2023
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