From c0b66bd06573f4db014c7a1ccde909ecfeb3086f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Noco=C5=84?= <mnocon@users.noreply.github.com>
Date: Fri, 8 Dec 2023 16:19:44 +0100
Subject: [PATCH] Run default solr

---
 .github/workflows/gha-docker-solr.yaml | 52 ++++++++++++++------------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/gha-docker-solr.yaml b/.github/workflows/gha-docker-solr.yaml
index 6ab219b047..f8175d7106 100644
--- a/.github/workflows/gha-docker-solr.yaml
+++ b/.github/workflows/gha-docker-solr.yaml
@@ -16,25 +16,31 @@ env:
 
 jobs:
     build-and-publish:
-        runs-on: ubuntu-latest
+        runs-on: "ubuntu-20.04"
+        timeout-minutes: 30
         permissions:
           packages: write
         services:
-            redis:
-                image: redis
-                ports:
-                    - 6379:6379
-                options: 
-                    --memory=60m
+              redis:
+                  image: redis
+                  ports:
+                      - 6379:6379
+                  options: 
+                      --memory=60m
+              solr:
+                  image: ghcr.io/ibexa/core/solr
+                  ports:
+                      - 8983:8983
+                  options: >-
+                      --health-cmd "solr status"
+                      --health-interval 10s
+                      --health-timeout 5s
+                      --health-retries 10
         steps:
-            - uses: actions/checkout@v3
-              with:
-                  fetch-depth: 0
-
             - name: Setup PHP Action
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: 8.1
+                  php-version: 7.4
                   coverage: none
             
             - name: Add solr dependency
@@ -46,22 +52,22 @@ jobs:
               with:
                   dependency-versions: "highest"
 
-            # - name: Build Solr image
-            #   run: docker build -t "$IMAGE_NAME:latest" docker/solr
-
-            - name: Start Solr image
-              run: | 
-                docker run --health-cmd "solr status" \
-                --health-interval 10s --health-timeout 5s --health-retries 10 \
-                -d -p 8983:8983 "$IMAGE_NAME:latest"
-
-            - name: Run Solr integration test suite
+            - name: Run integration test suite
               run: composer test-integration-solr
               continue-on-error: ${{ inputs.force != '' }}
               env:
+                    CUSTOM_CACHE_POOL: singleredis
                     CACHE_HOST: 127.0.0.1
                     CORES_SETUP: single
-                    CUSTOM_CACHE_POOL: singleredis
+
+            # - name: Build Solr image
+            #   run: docker build -t "$IMAGE_NAME:latest" docker/solr
+
+            # - name: Start Solr image
+              # run: | 
+              #   docker run --health-cmd "solr status" \
+              #   --health-interval 10s --health-timeout 5s --health-retries 10 \
+              #   -d -p 8983:8983 "$IMAGE_NAME:latest"
 
             - name: Log in to the Container registry
               uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1