From 42bc161f649ff1215c0c26be6510cdd8edebeb34 Mon Sep 17 00:00:00 2001 From: Nuno Santos Date: Tue, 15 Nov 2022 11:50:35 +0100 Subject: [PATCH 1/4] Support ES 7.17.7. --- build.gradle | 2 +- docs/pages/installation.md | 4 ++-- elastiknn-plugin/Dockerfile | 2 +- version | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 25da61901..7f2bb9e64 100644 --- a/build.gradle +++ b/build.gradle @@ -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' diff --git a/docs/pages/installation.md b/docs/pages/installation.md index d90554b89..8c144304a 100644 --- a/docs/pages/installation.md +++ b/docs/pages/installation.md @@ -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) diff --git a/elastiknn-plugin/Dockerfile b/elastiknn-plugin/Dockerfile index 428a71a70..b0005ac69 100644 --- a/elastiknn-plugin/Dockerfile +++ b/elastiknn-plugin/Dockerfile @@ -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) diff --git a/version b/version index d7e5a142e..0ac14ad32 100644 --- a/version +++ b/version @@ -1 +1 @@ -7.17.6.0 \ No newline at end of file +7.17.7.0 \ No newline at end of file From c1443b1be24ca907b321cab03d6d503f61c64c15 Mon Sep 17 00:00:00 2001 From: Nuno Santos Date: Wed, 16 Nov 2022 09:03:05 +0100 Subject: [PATCH 2/4] Trigger CI on pull requests against the branch cross-build-7.17.6. --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e76bceb98..2c152df04 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,6 +4,7 @@ on: pull_request: branches: - master + - 'cross-build-7.17.6' push: branches: - master From 63044f9b4d966c07abed75792a8ed16f1282be60 Mon Sep 17 00:00:00 2001 From: Nuno Santos Date: Wed, 16 Nov 2022 15:37:42 +0100 Subject: [PATCH 3/4] Remove guard on committer name on publish-snapshots task. --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2c152df04..7e914a314 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -106,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 From 87b8dd1aab52714b1b5b1d4ac1866c94617ec3ea Mon Sep 17 00:00:00 2001 From: Alex Klibisz Date: Wed, 16 Nov 2022 10:39:46 -0500 Subject: [PATCH 4/4] Move github publish above pypi publish --- .github/workflows/ci.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e914a314..1bc592055 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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: @@ -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