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

Replace Sami by Doctum and fix .gitignore #1062

Merged
merged 3 commits into from
Dec 16, 2020
Merged

Replace Sami by Doctum and fix .gitignore #1062

merged 3 commits into from
Dec 16, 2020

Conversation

williamdes
Copy link
Contributor

I hope I used the right branch because I was unsure with just a quick look to you GIT history

@elasticmachine
Copy link
Collaborator

Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually?

@ezimuel
Copy link
Contributor

ezimuel commented Sep 23, 2020

Thanks @williamdes, I'm not familiar with Doctum, I just saw it's a fork of Sami. I'll review this asap.

@williamdes
Copy link
Contributor Author

Thanks @williamdes, I'm not familiar with Doctum, I just saw it's a fork of Sami. I'll review this asap.

Hi @ezimuel
Did you have some time to have a look ?

@williamdes
Copy link
Contributor Author

Hi @ezimuel
It seems like the notification was lost somewhere ;)

@ezimuel
Copy link
Contributor

ezimuel commented Dec 9, 2020

I'm sorry @williamdes for the delay. Can you send the PR against 7.x branch instead of master? Thanks!

@williamdes williamdes changed the base branch from master to 7.x December 9, 2020 17:38
@williamdes
Copy link
Contributor Author

I'm sorry @williamdes for the delay. Can you send the PR against 7.x branch instead of master? Thanks!

Hi @ezimuel
I did trick the history and cherry-pick my commits + re-built the documentation

How will you handle master branch ?

@ezimuel
Copy link
Contributor

ezimuel commented Dec 10, 2020

@williamdes themaster branch is the next 8.0.0 version of elasticsearch-php that will be ready when Elasticsearch 8 will be available, next year. We need to release in pair with Elasticsearch version. That's why we are using 7.x branch at the moment as current branch. More information are available here: https://github.com/elastic/elasticsearch-php/blob/master/README.md#contributing
Thanks for re-branch the PR to 7.x!

@williamdes
Copy link
Contributor Author

Thanks for re-branch the PR to 7.x!

I also can rebase if you want :)

Okay, so my changes will end up into master branch at some point ?
Do you merge 7.x into master ?

@ezimuel
Copy link
Contributor

ezimuel commented Dec 10, 2020

I'm rewriting elasticsearch-php 8.0.0 from scratch. I'll merge this PR to master. Thanks!

@williamdes
Copy link
Contributor Author

I'm rewriting elasticsearch-php 8.0.0 from scratch. I'll merge this PR to master. Thanks!

Oh okay ;)
I am impatient to see the merge ^^

Also I just had a look and https://github.com/elastic/elasticsearch-php/blob/master/.gitattributes seems not very in sync with the reality

@mfn
Copy link

mfn commented Dec 10, 2020

rewriting elasticsearch-php 8.0.0 from scratch

👀

@ezimuel ezimuel merged commit 3c7d84c into elastic:7.x Dec 16, 2020
@ezimuel
Copy link
Contributor

ezimuel commented Dec 16, 2020

@williamdes thanks a ton for this PR, the Doctum project looks awesome!

@williamdes
Copy link
Contributor Author

@williamdes thanks a ton for this PR, the Doctum project looks awesome!

Thanks for merging my work, can you change

# Download the latest (5.1.x) release
curl -O https://doctum.long-term.support/releases/5.1/doctum.phar
curl -O https://doctum.long-term.support/releases/5.1/doctum.phar.sha256

sha256sum --strict --check doctum.phar.sha256
rm -f doctum.phar.sha256
# You can fetch the latest (5.1.x) version code here:
# https://doctum.long-term.support/releases/5.1/VERSION

by

# Download the latest (5.x.x) release
curl -O https://doctum.long-term.support/releases/5/doctum.phar
curl -O https://doctum.long-term.support/releases/5/doctum.phar.sha256

sha256sum --strict --check doctum.phar.sha256
rm -f doctum.phar.sha256
# You can fetch the latest (5.x.x) version code here:
# https://doctum.long-term.support/releases/5/VERSION

I just added the feature on the release script/process

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

Successfully merging this pull request may close these issues.

4 participants