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.

Sign up for GitHub

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

Jump to bottom

Support ES 7.17.7 #456

Closed
wants to merge 4 commits into from
Closed

Support ES 7.17.7 #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
42bc161
Support ES 7.17.7.
nfsantos Nov 15, 2022
c1443b1
Trigger CI on pull requests against the branch cross-build-7.17.6.
nfsantos Nov 16, 2022
63044f9
Remove guard on committer name on publish-snapshots task.
nfsantos Nov 16, 2022
87b8dd1
Move github publish above pypi publish
alexklibisz Nov 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
pull_request:
branches:
- master
- 'cross-build-7.17.6'
push:
branches:
- master
Expand Down Expand Up @@ -105,7 +106,6 @@ jobs:

publish-snapshots:
runs-on: ubuntu-20.04
if: ${{ github.actor == 'alexklibisz' }}
needs: [show-github-context, test-jvm, test-python, test-benchmarks]
steps:
- uses: actions/checkout@v2
Expand All @@ -130,15 +130,6 @@ jobs:
sudo snap install task --classic
sudo snap install hub --classic
python3 -m pip install setuptools
- name: Publish to PyPi
run: task py:publish-snapshot VERSION=$(cat version)-dev${{ github.run_number }}
if: github.event_name == 'pull_request'
- name: Publish JVM Libraries from PR
if: github.event_name == 'pull_request'
run: task jvm:libraries:publish:snapshot VERSION=$(cat version)-PR${{ github.event.pull_request.number }}-SNAPSHOT
- name: Publish JVM Libraries from Master
if: github.event_name == 'push'
run: task jvm:libraries:publish:snapshot VERSION=$(cat version)-MASTER${{ github.run_number }}-SNAPSHOT
- name: Publish Plugin from PR
if: github.event_name == 'pull_request'
env:
Expand All @@ -151,3 +142,12 @@ jobs:
run: |
./.github/scripts/delete-snapshot-releases.sh
task jvm:plugin:publish:snapshot VERSION=$(cat version)-MASTER${{ github.run_number }}-SNAPSHOT
- name: Publish to PyPi
run: task py:publish-snapshot VERSION=$(cat version)-dev${{ github.run_number }}
if: github.event_name == 'pull_request'
- name: Publish JVM Libraries from PR
if: github.event_name == 'pull_request'
run: task jvm:libraries:publish:snapshot VERSION=$(cat version)-PR${{ github.event.pull_request.number }}-SNAPSHOT
- name: Publish JVM Libraries from Master
if: github.event_name == 'push'
run: task jvm:libraries:publish:snapshot VERSION=$(cat version)-MASTER${{ github.run_number }}-SNAPSHOT
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildscript {
ext {
esVersion = '7.17.6'
esVersion = '7.17.7'
luceneVersion = '8.11.1'
elastic4sVersion = '7.17.3'
circeVersion= '0.14.1'
Expand Down
4 changes: 2 additions & 2 deletions docs/pages/installation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ Make a Dockerfile like below. The image version (`elasticsearch:A.B.C`) must mat
`A.B.C` is the Elasticsearch version. `.x` just refers to an incremental version of Elastiknn on top of `A.B.C`.

```docker
FROM docker.elastic.co/elasticsearch/elasticsearch:7.17.6
RUN elasticsearch-plugin install --batch https://github.com/alexklibisz/elastiknn/releases/download/7.17.6.0/elastiknn-7.17.6.0.zip
FROM docker.elastic.co/elasticsearch/elasticsearch:7.17.7
RUN elasticsearch-plugin install --batch https://github.com/alexklibisz/elastiknn/releases/download/7.17.7.0/elastiknn-7.17.7.0.zip
```

Build and run the Dockerfile. If you have any issues please refer to the [official docs.](https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html)
Expand Down
2 changes: 1 addition & 1 deletion elastiknn-plugin/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM docker.elastic.co/elasticsearch/elasticsearch:7.17.6-amd64
FROM docker.elastic.co/elasticsearch/elasticsearch:7.17.7-amd64
COPY build/distributions/*.zip .
RUN elasticsearch-plugin install -b file:$(ls elastiknn*zip | sort | tail -n1)
2 changes: 1 addition & 1 deletion version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.17.6.0
7.17.7.0