Skip to content

Commit 19d9b8b

Browse files
committed
Added YAML test script for CI
1 parent d49df6b commit 19d9b8b

File tree

4 files changed

+16
-13
lines changed

4 files changed

+16
-13
lines changed

.ci/Dockerfile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ FROM php:${PHP_VERSION}
44
# Create app directory
55
WORKDIR /usr/src/app
66

7-
COPY . .
8-
97
# Install git
108
RUN apt-get update && \
119
apt-get install -y --no-install-recommends git
@@ -15,10 +13,9 @@ RUN apt-get install -y \
1513
libzip-dev \
1614
zip \
1715
&& docker-php-ext-install zip
18-
16+
1917
# Install composer
2018
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
2119

22-
# Install dependencies using composer
23-
RUN composer global require hirak/prestissimo && \
24-
composer install --prefer-dist --no-progress --no-interaction
20+
# Install prestissimo pluing for composer
21+
RUN composer global require hirak/prestissimo

.ci/run-repository.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ repo=$(realpath $(dirname $(realpath -s $0))/../)
3333

3434
docker run \
3535
--network=${network_name} \
36-
--env "STACK_VERSION=${STACK_VERSION}" \
37-
--env "TEST_SUITE=${TEST_SUITE}" \
38-
--env "PHP_VERSION=${PHP_VERSION}" \
39-
--env "ELASTICSEARCH_URL=${ELASTICSEARCH_URL}" \
4036
--volume $repo:/usr/src/app \
37+
--env STACK_VERSION=${STACK_VERSION} \
38+
--env TEST_SUITE=${TEST_SUITE} \
39+
--env PHP_VERSION=${PHP_VERSION} \
40+
--env ELASTICSEARCH_URL=${ELASTICSEARCH_URL} \
4141
--ulimit nofile=65535:65535 \
4242
--name elasticsearch-php \
4343
--rm \
44-
elastic/elasticsearch-php \
45-
php util/RestSpecRunner.php && vendor/bin/phpunit -c phpunit-integration.xml --group sync
44+
elastic/elasticsearch-php
45+
$script_path/run-yaml-tests.sh

.ci/run-yaml-tests.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/usr/bin/env bash
2+
3+
composer install
4+
git submodule update --init --recursive
5+
php util/RestSpecRunner.php
6+
vendor/bin/phpunit -c phpunit-integration.xml --group sync

.ci/test-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
STACK_VERSION:
3-
- 7.7.0-SNAPSHOT
3+
- 8.0.0-SNAPSHOT
44

55
PHP_VERSION:
66
- 7.4-cli

0 commit comments

Comments
 (0)