Skip to content

Commit 893ad0a

Browse files
woxxywoxxy
committed
ci: use search images in Actions and bump Sphinx versions
1 parent 139bf7b commit 893ad0a

7 files changed

Lines changed: 244 additions & 37 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 68 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,12 @@ concurrency:
1313
jobs:
1414
test:
1515
name: PHP ${{ matrix.php }} / ${{ matrix.driver }} / ${{ matrix.search_build }}
16-
runs-on: ubuntu-latest
16+
runs-on: ubuntu-22.04
1717
timeout-minutes: 30
1818
continue-on-error: ${{ matrix.search_build == 'SPHINX3' }}
19+
permissions:
20+
contents: read
21+
packages: read
1922
strategy:
2023
fail-fast: false
2124
matrix:
@@ -38,48 +41,75 @@ jobs:
3841
extensions: mysqli, pdo_mysql, mbstring
3942
tools: composer:v2
4043

41-
- name: Install system dependencies
44+
- name: Resolve search image and group exclusions
45+
id: vars
4246
run: |
43-
sudo apt-get update
44-
if ! sudo apt-get install -y --no-install-recommends libodbc1; then
45-
sudo apt-get install -y --no-install-recommends libodbc2
47+
EXCLUDE_GROUP=""
48+
SEARCH_IMAGE=""
49+
SEARCH_DOCKERFILE=""
50+
case "$SEARCH_BUILD" in
51+
SPHINX2)
52+
SEARCH_IMAGE="ghcr.io/foolcode/sphinxql-query-builder-search-sphinx2:sphinx2-latest"
53+
SEARCH_DOCKERFILE="docker/search/sphinx2/Dockerfile"
54+
EXCLUDE_GROUP="--exclude-group=Manticore"
55+
;;
56+
SPHINX3)
57+
SEARCH_IMAGE="ghcr.io/foolcode/sphinxql-query-builder-search-sphinx3:sphinx3-latest"
58+
SEARCH_DOCKERFILE="docker/search/sphinx3/Dockerfile"
59+
EXCLUDE_GROUP="--exclude-group=Manticore"
60+
;;
61+
MANTICORE)
62+
SEARCH_IMAGE="ghcr.io/foolcode/sphinxql-query-builder-search-manticore:manticore-latest"
63+
SEARCH_DOCKERFILE="docker/search/manticore/Dockerfile"
64+
;;
65+
*)
66+
echo "Unknown SEARCH_BUILD: $SEARCH_BUILD"
67+
exit 1
68+
;;
69+
esac
70+
{
71+
echo "search_image=$SEARCH_IMAGE"
72+
echo "search_dockerfile=$SEARCH_DOCKERFILE"
73+
echo "exclude_group=$EXCLUDE_GROUP"
74+
} >> "$GITHUB_OUTPUT"
75+
76+
- name: Fetch search image
77+
run: |
78+
if ! docker pull "${{ steps.vars.outputs.search_image }}"; then
79+
echo "Unable to pull image, building from repository Dockerfile fallback."
80+
docker build -f "${{ steps.vars.outputs.search_dockerfile }}" -t "${{ steps.vars.outputs.search_image }}" .
4681
fi
47-
sudo apt-get install -y --no-install-recommends \
48-
gcc \
49-
g++ \
50-
make \
51-
autoconf \
52-
automake \
53-
libtool \
54-
pkg-config \
55-
wget \
56-
tar
5782
58-
- name: Install search engine
83+
- name: Start search daemon container
5984
run: |
60-
mkdir -p "$HOME/search"
61-
pushd "$HOME/search"
62-
"$GITHUB_WORKSPACE/tests/install.sh"
63-
popd
85+
docker run -d --name searchd \
86+
-p 9307:9307 \
87+
-p 9312:9312 \
88+
"${{ steps.vars.outputs.search_image }}"
89+
90+
- name: Wait for searchd
91+
run: |
92+
n=0
93+
while [ "$n" -lt 60 ]; do
94+
if (echo > /dev/tcp/127.0.0.1/9307) >/dev/null 2>&1; then
95+
exit 0
96+
fi
97+
n=$((n + 1))
98+
sleep 1
99+
done
100+
echo "searchd did not become ready on 127.0.0.1:9307"
101+
docker logs searchd || true
102+
exit 1
64103
65104
- name: Install dependencies
66105
run: composer update --prefer-dist --no-interaction
67106

68107
- name: Prepare autoload
69108
run: composer dump-autoload
70109

71-
- name: Start search daemon
72-
run: |
73-
cd tests
74-
"$GITHUB_WORKSPACE/tests/run.sh"
75-
76110
- name: Run tests
77111
run: |
78-
EXCLUDE_GROUP=""
79-
if [ "$SEARCH_BUILD" != "MANTICORE" ]; then
80-
EXCLUDE_GROUP="--exclude-group=Manticore"
81-
fi
82-
./vendor/bin/phpunit --configuration "tests/travis/${DRIVER}.phpunit.xml" --coverage-text $EXCLUDE_GROUP
112+
./vendor/bin/phpunit --configuration "tests/travis/${DRIVER}.phpunit.xml" --coverage-text ${{ steps.vars.outputs.exclude_group }}
83113
84114
- name: Upload debug artifacts on failure
85115
if: failure()
@@ -91,3 +121,11 @@ jobs:
91121
tests/searchd.log
92122
tests/searchd.pid
93123
tests/data/*
124+
125+
- name: Show searchd logs
126+
if: always()
127+
run: docker logs searchd || true
128+
129+
- name: Stop searchd container
130+
if: always()
131+
run: docker rm -f searchd || true

‎.github/workflows/publish-search-images.yml‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: Publish Search Images
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches:
7+
- master
8+
paths:
9+
- .github/workflows/publish-search-images.yml
10+
- docker/search/**
11+
- tests/sphinx.conf
12+
- tests/manticore.conf
13+
- tests/test_udf.c
14+
- tests/ms_test_udf.c
15+
16+
permissions:
17+
contents: read
18+
packages: write
19+
20+
jobs:
21+
publish:
22+
name: Publish ${{ matrix.target }} image
23+
runs-on: ubuntu-latest
24+
strategy:
25+
fail-fast: false
26+
matrix:
27+
include:
28+
- target: sphinx2
29+
version: 2.3.2-beta
30+
dockerfile: docker/search/sphinx2/Dockerfile
31+
- target: sphinx3
32+
version: 3.9.1
33+
dockerfile: docker/search/sphinx3/Dockerfile
34+
- target: manticore
35+
version: 2.6.3
36+
dockerfile: docker/search/manticore/Dockerfile
37+
38+
steps:
39+
- name: Checkout
40+
uses: actions/checkout@v4
41+
42+
- name: Set up Docker Buildx
43+
uses: docker/setup-buildx-action@v3
44+
45+
- name: Login to GHCR
46+
uses: docker/login-action@v3
47+
with:
48+
registry: ghcr.io
49+
username: ${{ github.actor }}
50+
password: ${{ secrets.GITHUB_TOKEN }}
51+
52+
- name: Build and push
53+
uses: docker/build-push-action@v6
54+
with:
55+
context: .
56+
file: ${{ matrix.dockerfile }}
57+
push: true
58+
tags: |
59+
ghcr.io/foolcode/sphinxql-query-builder-search-${{ matrix.target }}:${{ matrix.target }}-${{ matrix.version }}
60+
ghcr.io/foolcode/sphinxql-query-builder-search-${{ matrix.target }}:${{ matrix.target }}-latest
61+
cache-from: type=gha
62+
cache-to: type=gha,mode=max

‎docker/search/manticore/Dockerfile‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
FROM ubuntu:22.04
2+
3+
ENV DEBIAN_FRONTEND=noninteractive
4+
ENV MANTICORE_VERSION=2.6.3
5+
ENV LD_LIBRARY_PATH=/opt/manticore/usr/lib/x86_64-linux-gnu:/opt/manticore/usr/lib
6+
7+
RUN apt-get update \
8+
&& apt-get install -y --no-install-recommends \
9+
ca-certificates \
10+
wget \
11+
gcc \
12+
libc6-dev \
13+
&& rm -rf /var/lib/apt/lists/*
14+
15+
WORKDIR /opt/sphinx-tests
16+
17+
RUN wget --quiet -O /opt/sphinx-tests/search.deb \
18+
"https://github.com/manticoresoftware/manticoresearch/releases/download/${MANTICORE_VERSION}/manticore_${MANTICORE_VERSION}-180328-cccb538-release-stemmer.trusty_amd64-bin.deb" \
19+
&& dpkg -x /opt/sphinx-tests/search.deb /opt/manticore \
20+
&& rm -f /opt/sphinx-tests/search.deb
21+
22+
COPY tests/manticore.conf /opt/sphinx-tests/manticore.conf
23+
COPY tests/ms_test_udf.c /opt/sphinx-tests/ms_test_udf.c
24+
25+
RUN mkdir -p /opt/sphinx-tests/data \
26+
&& gcc -shared -fPIC -I/opt/manticore/usr/include -o /opt/sphinx-tests/data/test_udf.so /opt/sphinx-tests/ms_test_udf.c
27+
28+
EXPOSE 9307 9312
29+
30+
CMD ["/opt/manticore/usr/bin/searchd", "-c", "/opt/sphinx-tests/manticore.conf", "--nodetach"]

‎docker/search/sphinx2/Dockerfile‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
FROM ubuntu:24.04
2+
3+
ENV DEBIAN_FRONTEND=noninteractive
4+
ENV SPHINX2_VERSION=2.3.2-beta
5+
6+
RUN apt-get update \
7+
&& apt-get install -y --no-install-recommends \
8+
ca-certificates \
9+
wget \
10+
gcc \
11+
g++ \
12+
make \
13+
autoconf \
14+
automake \
15+
libtool \
16+
pkg-config \
17+
bison \
18+
flex \
19+
libexpat1-dev \
20+
zlib1g-dev \
21+
libssl-dev \
22+
&& rm -rf /var/lib/apt/lists/*
23+
24+
WORKDIR /opt/sphinx-tests
25+
26+
RUN wget --quiet "https://sphinxsearch.com/files/sphinx-${SPHINX2_VERSION}.tar.gz" \
27+
&& tar zxf "sphinx-${SPHINX2_VERSION}.tar.gz" \
28+
&& cd "sphinx-${SPHINX2_VERSION}" \
29+
&& ./configure --prefix=/opt/sphinx --without-mysql \
30+
&& make -j"$(nproc)" \
31+
&& make install \
32+
&& cd /opt/sphinx-tests \
33+
&& rm -rf "sphinx-${SPHINX2_VERSION}" "sphinx-${SPHINX2_VERSION}.tar.gz"
34+
35+
COPY tests/sphinx.conf /opt/sphinx-tests/sphinx.conf
36+
COPY tests/test_udf.c /opt/sphinx-tests/test_udf.c
37+
38+
RUN mkdir -p /opt/sphinx-tests/data \
39+
&& gcc -shared -o /opt/sphinx-tests/data/test_udf.so /opt/sphinx-tests/test_udf.c
40+
41+
EXPOSE 9307 9312
42+
43+
CMD ["/opt/sphinx/bin/searchd", "-c", "/opt/sphinx-tests/sphinx.conf", "--nodetach"]

‎docker/search/sphinx3/Dockerfile‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
FROM ubuntu:24.04
2+
3+
ENV DEBIAN_FRONTEND=noninteractive
4+
ENV SPHINX3_VERSION=3.9.1
5+
ENV SPHINX3_BUILD=141d2ea
6+
7+
RUN apt-get update \
8+
&& apt-get install -y --no-install-recommends \
9+
ca-certificates \
10+
wget \
11+
gcc \
12+
libc6-dev \
13+
&& rm -rf /var/lib/apt/lists/*
14+
15+
WORKDIR /opt/sphinx-tests
16+
17+
RUN wget --quiet "https://sphinxsearch.com/files/sphinx-${SPHINX3_VERSION}-${SPHINX3_BUILD}-linux-amd64.tar.gz" \
18+
&& tar zxf "sphinx-${SPHINX3_VERSION}-${SPHINX3_BUILD}-linux-amd64.tar.gz" \
19+
&& mv "sphinx-${SPHINX3_VERSION}" /opt/sphinx3 \
20+
&& rm -f "sphinx-${SPHINX3_VERSION}-${SPHINX3_BUILD}-linux-amd64.tar.gz"
21+
22+
COPY tests/sphinx.conf /opt/sphinx-tests/sphinx.conf
23+
COPY tests/test_udf.c /opt/sphinx-tests/test_udf.c
24+
25+
RUN mkdir -p /opt/sphinx-tests/data \
26+
&& gcc -shared -o /opt/sphinx-tests/data/test_udf.so /opt/sphinx-tests/test_udf.c
27+
28+
EXPOSE 9307 9312
29+
30+
CMD ["/opt/sphinx3/bin/searchd", "-c", "/opt/sphinx-tests/sphinx.conf", "--nodetach"]

‎tests/install.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
case $SEARCH_BUILD in
44
SPHINX2)
5-
wget --quiet http://sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
6-
tar zxvf sphinx-2.2.11-release.tar.gz
7-
cd sphinx-2.2.11-release
8-
./configure --prefix=/usr/local/sphinx
5+
wget --quiet https://sphinxsearch.com/files/sphinx-2.3.2-beta.tar.gz
6+
tar zxvf sphinx-2.3.2-beta.tar.gz
7+
cd sphinx-2.3.2-beta
8+
./configure --prefix=/usr/local/sphinx --without-mysql
99
sudo make && sudo make install
1010
;;
1111
SPHINX3)
12-
wget --quiet http://sphinxsearch.com/files/sphinx-3.0.3-facc3fb-linux-amd64.tar.gz
13-
tar zxvf sphinx-3.0.3-facc3fb-linux-amd64.tar.gz
12+
wget --quiet https://sphinxsearch.com/files/sphinx-3.9.1-141d2ea-linux-amd64.tar.gz
13+
tar zxvf sphinx-3.9.1-141d2ea-linux-amd64.tar.gz
1414
;;
1515
MANTICORE)
1616
wget --quiet -O search.deb https://github.com/manticoresoftware/manticoresearch/releases/download/2.6.3/manticore_2.6.3-180328-cccb538-release-stemmer.trusty_amd64-bin.deb

‎tests/run.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ case $SEARCH_BUILD in
77
/usr/local/sphinx/bin/searchd -c sphinx.conf
88
;;
99
SPHINX3)
10-
WORK=$HOME/search/sphinx-3.0.3
10+
WORK=$(find "$HOME/search" -maxdepth 1 -type d -name 'sphinx-3.*' | head -n 1)
11+
if [ -z "$WORK" ] || [ ! -d "$WORK" ]; then
12+
echo "Unable to find extracted SPHINX3 directory."
13+
exit 1
14+
fi
1115
UDF_SRC="$WORK/src/udfexample.c"
1216
if [ ! -f "$UDF_SRC" ]; then
1317
UDF_SRC=$(find "$HOME/search" -path '*/src/udfexample.c' | head -n 1)

0 commit comments

Comments
 (0)