Merge pull request #497 from ClearcodeHQ/setup-elasticsearch

Change the way elasticsearch is set up - closes #468

.github/actions/pytest/action.yml

@@ -14,23 +14,26 @@ runs:
     uses: actions/setup-python@v3
     with:
       python-version: ${{ inputs.python-version }}
-  - name: Cache Elasticsearch installations
-    uses: actions/cache@v3
+  - uses: actions/cache@v3
     with:
-      path: ~/es
-      key: es-${{ hashFiles('.install-elasticsearch.sh') }}
+      path: ~/elasticsearch
+      key: elasticsearch-${{ inputs.elasticsearch }}
+  - name: Setup elasticsearch
+    uses: ankane/setup-elasticsearch@v1
+    with:
+      elasticsearch-version: ${{ inputs.elasticsearch }}
   - name: Run test
     uses: fizyk/actions-reuse/.github/actions/[email protected]
     with:
       python-version: ${{ matrix.python-version }}
       pipenv-install-options: "--skip-lock"
-      command: pytest --elasticsearch-executable=/home/runner/es/elasticsearch-${{ inputs.elasticsearch }}/bin/elasticsearch -n 0 --cov-report=xml
+      command: pytest --elasticsearch-executable=$ES_HOME/bin/elasticsearch -n 0 --cov-report=xml
   - name: Run xdist test
     uses: fizyk/actions-reuse/.github/actions/[email protected]
     with:
       python-version: ${{ matrix.python-version }}
       pipenv-install-options: "--skip-lock"
-      command: pytest --elasticsearch-executable=/home/runner/es/elasticsearch-${{ inputs.elasticsearch }}/bin/elasticsearch -n 1 --cov-report=xml:coverage-xdist.xml
+      command: pytest --elasticsearch-executable=$ES_HOME/bin/elasticsearch -n 1 --cov-report=xml:coverage-xdist.xml
   - name: Upload coverage to Codecov
     uses: codecov/[email protected]
     with:

.github/workflows/tests.yml

@@ -7,19 +7,7 @@ on:
     branches: [ main ]
 
 jobs:
-  install_es:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: Cache Elasticsearch installations
-      uses: actions/cache@v3
-      with:
-        path: ~/es
-        key: es-${{ hashFiles('.install-elasticsearch.sh') }}
-    - name: Install Elasticsearch
-      run: ./.install-elasticsearch.sh
   tests_7_17:
-    needs: [install_es]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
@@ -82,19 +70,3 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           elasticsearch: "7.14"
-  tests_6_8:
-    needs: [install_es]
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      matrix:
-        python-version: [3.7, 3.8, 3.9, "3.10", pypy-3.8]
-    env:
-      OS: ubuntu-latest
-      PYTHON: ${{ matrix.python-version }}
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/pytest
-        with:
-          python-version: ${{ matrix.python-version }}
-          elasticsearch: "6.8.18"

newsfragments/486.misc.rst

@@ -0,0 +1 @@
+Switched custom elasticsearch installation script to `ankane/setup-elasticsearch@v1`