From 7674262b188cc5646ea6680284258c2a00308d80 Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Tue, 12 May 2020 10:23:07 +0300 Subject: [PATCH 01/23] First pass at the Docker container --- docker/docker-compose.yml | 11 +++++++ docker/readme.md | 3 ++ docker/wp-dev-lib/Dockerfile | 30 ++++++++++++++++++++ docker/wp-dev-lib/config/wp-tests-config.php | 25 ++++++++++++++++ docker/wp-dev-lib/docker-entrypoint.sh | 29 +++++++++++++++++++ 5 files changed, 98 insertions(+) create mode 100644 docker/docker-compose.yml create mode 100644 docker/readme.md create mode 100644 docker/wp-dev-lib/Dockerfile create mode 100644 docker/wp-dev-lib/config/wp-tests-config.php create mode 100644 docker/wp-dev-lib/docker-entrypoint.sh diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml new file mode 100644 index 0000000..aa37007 --- /dev/null +++ b/docker/docker-compose.yml @@ -0,0 +1,11 @@ +version: '3.6' + +services: + + wpdevlib: + build: ./wp-dev-lib + working_dir: /var/www/html + volumes: + - .:/var/www/html + environment: + CHECK_SCOPE: all diff --git a/docker/readme.md b/docker/readme.md new file mode 100644 index 0000000..410c8ce --- /dev/null +++ b/docker/readme.md @@ -0,0 +1,3 @@ +# Docker Image for wp-dev-lib + +This is a self-contained Docker container for running wp-dev-lib tasks. It bundles all services and software dependencies required for running the tasks. diff --git a/docker/wp-dev-lib/Dockerfile b/docker/wp-dev-lib/Dockerfile new file mode 100644 index 0000000..8fb3237 --- /dev/null +++ b/docker/wp-dev-lib/Dockerfile @@ -0,0 +1,30 @@ +ARG WP_PHP_VERSION=7.4 +FROM wordpress:php${WP_PHP_VERSION}-fpm + +ENV DEBIAN_FRONTEND noninteractive + +# Development tooling dependencies. +RUN apt-get update \ + && apt-get install --yes --no-install-recommends \ + bash less subversion default-mysql-server default-mysql-client libxml2-utils rsync git zip unzip \ + nodejs npm curl \ + && npm install --global npm@latest \ + && rm -rf /var/lib/apt/lists/* + +# Setup xdebug. +RUN pecl install xdebug \ + && docker-php-ext-enable xdebug + +# Install Composer. +RUN curl -s https://getcomposer.org/installer | php \ + && mv composer.phar /usr/local/bin/composer + +# Keep a copy of our default test config. +COPY config/wp-tests-config.php /tmp/wp-dev-lib/wp-tests-config.php + +# Setup a custom entrypoint that bootstraps the environment. +COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh + +VOLUME /tmp/wordpress + +ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/docker/wp-dev-lib/config/wp-tests-config.php b/docker/wp-dev-lib/config/wp-tests-config.php new file mode 100644 index 0000000..9eba8a0 --- /dev/null +++ b/docker/wp-dev-lib/config/wp-tests-config.php @@ -0,0 +1,25 @@ + Date: Tue, 12 May 2020 10:23:41 +0300 Subject: [PATCH 02/23] Set the correct flags --- docker/wp-dev-lib/docker-entrypoint.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 docker/wp-dev-lib/docker-entrypoint.sh diff --git a/docker/wp-dev-lib/docker-entrypoint.sh b/docker/wp-dev-lib/docker-entrypoint.sh old mode 100644 new mode 100755 From f7e3c4abe93b787855e1dce21ee9962262841f13 Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Tue, 12 May 2020 10:29:52 +0300 Subject: [PATCH 03/23] Just delete them all --- docker/wp-dev-lib/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/wp-dev-lib/Dockerfile b/docker/wp-dev-lib/Dockerfile index 8fb3237..5100b35 100644 --- a/docker/wp-dev-lib/Dockerfile +++ b/docker/wp-dev-lib/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update \ bash less subversion default-mysql-server default-mysql-client libxml2-utils rsync git zip unzip \ nodejs npm curl \ && npm install --global npm@latest \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/ # Setup xdebug. RUN pecl install xdebug \ From e0d13660cf79709dccec88d8d23247bbf7b088df Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Tue, 12 May 2020 10:40:06 +0300 Subject: [PATCH 04/23] Add a reminder about the custom DB --- docker/wp-dev-lib/docker-entrypoint.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/wp-dev-lib/docker-entrypoint.sh b/docker/wp-dev-lib/docker-entrypoint.sh index 69daaf8..b0a1128 100755 --- a/docker/wp-dev-lib/docker-entrypoint.sh +++ b/docker/wp-dev-lib/docker-entrypoint.sh @@ -8,7 +8,8 @@ export WP_SVN_URL="${WP_SVN_URL:-https://develop.svn.wordpress.org/trunk/}" service mysql start # Ensure we have a password and a fresh database. -# TODO: Figure out the ERROR 1045 (28000) error because of the password change. +# TODO Figure out the ERROR 1045 (28000) error because of the password change. +# TODO Allow custom test DB content. mysql --user=root --password=root << END DROP DATABASE IF EXISTS wordpress_test; CREATE DATABASE wordpress_test; From 3f4d9b88ac731183fc43a14c925a7e536faf18fa Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Tue, 12 May 2020 10:47:36 +0300 Subject: [PATCH 05/23] Add a basic build script --- docker/build.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100755 docker/build.sh diff --git a/docker/build.sh b/docker/build.sh new file mode 100755 index 0000000..8fb22a8 --- /dev/null +++ b/docker/build.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +IMAGE_NAME="xwpco/wp-dev-lib" +REPO_TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) +WP_DEV_LIB_VERSION=${WP_DEV_LIB_VERSION:-$REPO_TAG} + +# Don't provide the "latest" tag to ensure users always lock to a specific version. +docker build \ + --build-arg WP_PHP_VERSION=7.4 \ + --tag "$IMAGE_NAME:$WP_DEV_LIB_VERSION" \ + --tag "$IMAGE_NAME:$WP_DEV_LIB_VERSION-php7.4" \ + ./wp-dev-lib + From f9b480ee98144bf5b15db752220d5a562834550a Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Tue, 12 May 2020 10:50:45 +0300 Subject: [PATCH 06/23] Allow this to be run from anywhere --- docker/build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/build.sh b/docker/build.sh index 8fb22a8..abf1d55 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -1,6 +1,8 @@ #!/bin/bash IMAGE_NAME="xwpco/wp-dev-lib" +IMAGE_SRC_DIR="$(dirname "$0")/wp-dev-lib" + REPO_TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) WP_DEV_LIB_VERSION=${WP_DEV_LIB_VERSION:-$REPO_TAG} @@ -9,5 +11,5 @@ docker build \ --build-arg WP_PHP_VERSION=7.4 \ --tag "$IMAGE_NAME:$WP_DEV_LIB_VERSION" \ --tag "$IMAGE_NAME:$WP_DEV_LIB_VERSION-php7.4" \ - ./wp-dev-lib + "$IMAGE_SRC_DIR" From fd61a6237228ea615083f7c29f25bcbb9d54caf7 Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Tue, 12 May 2020 10:54:31 +0300 Subject: [PATCH 07/23] Using the existing test plugin for this --- docker/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index aa37007..cb8202d 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -2,10 +2,10 @@ version: '3.6' services: - wpdevlib: + test: build: ./wp-dev-lib working_dir: /var/www/html volumes: - - .:/var/www/html + - ../tests/composer:/var/www/html environment: CHECK_SCOPE: all From ffdb292a6c4b5743f7a3644d5feeed2253e61b7a Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Tue, 12 May 2020 10:56:41 +0300 Subject: [PATCH 08/23] Make it verbose on purpose --- docker/wp-dev-lib/docker-entrypoint.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/wp-dev-lib/docker-entrypoint.sh b/docker/wp-dev-lib/docker-entrypoint.sh index b0a1128..80e0d03 100755 --- a/docker/wp-dev-lib/docker-entrypoint.sh +++ b/docker/wp-dev-lib/docker-entrypoint.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -x + export WP_CORE_DIR="${WP_CORE_DIR:-/tmp/wordpress}" export WP_TESTS_DIR="${WP_TESTS_DIR:-$WP_CORE_DIR/tests/phpunit}" export WP_SVN_URL="${WP_SVN_URL:-https://develop.svn.wordpress.org/trunk/}" From 6ee6d7f884ce5706e6386268116f406e273bc341 Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Tue, 12 May 2020 11:05:23 +0300 Subject: [PATCH 09/23] Read from the string instead to support multiple commands --- docker/wp-dev-lib/docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/wp-dev-lib/docker-entrypoint.sh b/docker/wp-dev-lib/docker-entrypoint.sh index 80e0d03..911b7bc 100755 --- a/docker/wp-dev-lib/docker-entrypoint.sh +++ b/docker/wp-dev-lib/docker-entrypoint.sh @@ -29,4 +29,4 @@ if [ ! -f /tmp/wordpress/wp-tests-config.php ]; then fi # Run the command passed to this container. -exec "$@" +exec -c "$@" From 4444816c4d8849542905a8c406a120f7e0363359 Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Tue, 12 May 2020 11:07:23 +0300 Subject: [PATCH 10/23] Checkout WP core only if not exists --- docker/wp-dev-lib/docker-entrypoint.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/wp-dev-lib/docker-entrypoint.sh b/docker/wp-dev-lib/docker-entrypoint.sh index 911b7bc..ed5f04b 100755 --- a/docker/wp-dev-lib/docker-entrypoint.sh +++ b/docker/wp-dev-lib/docker-entrypoint.sh @@ -21,7 +21,9 @@ mysql --user=root --password=root << END END # Ensure we have the WP core files. -svn export --force "$WP_SVN_URL" /tmp/wordpress +if [ ! -d /tmp/wordpress/tests ]; then + svn export --force "$WP_SVN_URL" /tmp/wordpress +fi # Create a symlink to tests config if not found. if [ ! -f /tmp/wordpress/wp-tests-config.php ]; then From 9d4071f41fee832568f28889a08dd798d1a63342 Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Tue, 12 May 2020 11:47:01 +0300 Subject: [PATCH 11/23] Start the PHP service by default --- docker/wp-dev-lib/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/wp-dev-lib/Dockerfile b/docker/wp-dev-lib/Dockerfile index 5100b35..9f7ec3c 100644 --- a/docker/wp-dev-lib/Dockerfile +++ b/docker/wp-dev-lib/Dockerfile @@ -28,3 +28,5 @@ COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh VOLUME /tmp/wordpress ENTRYPOINT ["docker-entrypoint.sh"] + +CMD ["php-fpm"] From 331299e0b3124bc1e26d03b92fc79b06750c543b Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Tue, 12 May 2020 11:47:39 +0300 Subject: [PATCH 12/23] Sync the whole project to ensure relative paths --- docker/docker-compose.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index cb8202d..c8197d8 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -4,8 +4,9 @@ services: test: build: ./wp-dev-lib - working_dir: /var/www/html + working_dir: /var/www/html/tests/composer volumes: - - ../tests/composer:/var/www/html + - ..:/var/www/html + command: composer install && composer test environment: CHECK_SCOPE: all From 23c7aa90884e21e7f7824c32ba487b0b8b6dc8da Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Tue, 12 May 2020 12:05:46 +0300 Subject: [PATCH 13/23] Bail on errors --- docker/wp-dev-lib/docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/wp-dev-lib/docker-entrypoint.sh b/docker/wp-dev-lib/docker-entrypoint.sh index ed5f04b..80b1f42 100755 --- a/docker/wp-dev-lib/docker-entrypoint.sh +++ b/docker/wp-dev-lib/docker-entrypoint.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -x +set -ex export WP_CORE_DIR="${WP_CORE_DIR:-/tmp/wordpress}" export WP_TESTS_DIR="${WP_TESTS_DIR:-$WP_CORE_DIR/tests/phpunit}" From 1fc652ac2f4890c17324e9039791a56a0077d814 Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Tue, 12 May 2020 12:06:19 +0300 Subject: [PATCH 14/23] The command is responsible for grouping vars --- docker/wp-dev-lib/docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/wp-dev-lib/docker-entrypoint.sh b/docker/wp-dev-lib/docker-entrypoint.sh index 80b1f42..9113b79 100755 --- a/docker/wp-dev-lib/docker-entrypoint.sh +++ b/docker/wp-dev-lib/docker-entrypoint.sh @@ -31,4 +31,4 @@ if [ ! -f /tmp/wordpress/wp-tests-config.php ]; then fi # Run the command passed to this container. -exec -c "$@" +exec "$@" From 99d7d3489876f5b079d926d3314992884814ca96 Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Tue, 12 May 2020 12:06:31 +0300 Subject: [PATCH 15/23] Add a dummy email address for git --- docker/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index c8197d8..182a7cd 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -10,3 +10,4 @@ services: command: composer install && composer test environment: CHECK_SCOPE: all + EMAIL: test@example.com From b59c19b5b751d795d7da61c27599f06a06ac8188 Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Tue, 12 May 2020 12:07:54 +0300 Subject: [PATCH 16/23] Proper way of running multiple commands --- docker/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 182a7cd..e9ed50c 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -7,7 +7,7 @@ services: working_dir: /var/www/html/tests/composer volumes: - ..:/var/www/html - command: composer install && composer test + command: bash -c "composer install && composer test" environment: CHECK_SCOPE: all EMAIL: test@example.com From 0d0d6a18de55472fccc73e281c46348a11146708 Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Tue, 12 May 2020 12:50:02 +0300 Subject: [PATCH 17/23] Persist the WP core files --- docker/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index e9ed50c..cc3662f 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -6,6 +6,7 @@ services: build: ./wp-dev-lib working_dir: /var/www/html/tests/composer volumes: + - /tmp/wordpress - ..:/var/www/html command: bash -c "composer install && composer test" environment: From 9631c63c42f4da84e0bb0af770f0a7f2804eabfb Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Tue, 12 May 2020 12:50:30 +0300 Subject: [PATCH 18/23] Copy to ensure PHP resolves paths correctly --- docker/wp-dev-lib/docker-entrypoint.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/wp-dev-lib/docker-entrypoint.sh b/docker/wp-dev-lib/docker-entrypoint.sh index 9113b79..f9e93f8 100755 --- a/docker/wp-dev-lib/docker-entrypoint.sh +++ b/docker/wp-dev-lib/docker-entrypoint.sh @@ -25,9 +25,9 @@ if [ ! -d /tmp/wordpress/tests ]; then svn export --force "$WP_SVN_URL" /tmp/wordpress fi -# Create a symlink to tests config if not found. +# Ensure we have a config file to work with. if [ ! -f /tmp/wordpress/wp-tests-config.php ]; then - ln -s /tmp/wp-dev-lib/wp-tests-config.php /tmp/wordpress/wp-tests-config.php + cp /tmp/wp-dev-lib/wp-tests-config.php /tmp/wordpress/wp-tests-config.php fi # Run the command passed to this container. From 23bf469d00dc8219b0d4c1608d50cb4c56802595 Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Tue, 12 May 2020 12:55:40 +0300 Subject: [PATCH 19/23] Test the Docker build --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7fd8a3d..a09d600 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ php: services: - mysql + - docker addons: apt: @@ -31,6 +32,7 @@ script: - composer test # Run linters for the wp-dev-lib files. - composer install --working-dir="tests/composer" # Test Composer integration setup. - composer test --working-dir="tests/composer" # Test Composer integration pre-commit hook. + - docker-compose --file=docker/docker-compose.yml run test # Test the Docker image. - cd tests/composer && export DEV_LIB_PATH=vendor/xwp/wp-dev-lib/scripts # We need Bash shell which might not be available in Composer scripts. - source "$DEV_LIB_PATH/travis.install.sh" - source "$DEV_LIB_PATH/travis.script.sh" From f2364b24113977f309edbb5b8b2b36d898e78aa5 Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Tue, 12 May 2020 13:32:51 +0300 Subject: [PATCH 20/23] Remove unused --- docker/build.sh | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100755 docker/build.sh diff --git a/docker/build.sh b/docker/build.sh deleted file mode 100755 index abf1d55..0000000 --- a/docker/build.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -IMAGE_NAME="xwpco/wp-dev-lib" -IMAGE_SRC_DIR="$(dirname "$0")/wp-dev-lib" - -REPO_TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) -WP_DEV_LIB_VERSION=${WP_DEV_LIB_VERSION:-$REPO_TAG} - -# Don't provide the "latest" tag to ensure users always lock to a specific version. -docker build \ - --build-arg WP_PHP_VERSION=7.4 \ - --tag "$IMAGE_NAME:$WP_DEV_LIB_VERSION" \ - --tag "$IMAGE_NAME:$WP_DEV_LIB_VERSION-php7.4" \ - "$IMAGE_SRC_DIR" - From 78dd135e85fc2167122fc918b5fe50c4b8c63a7b Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Tue, 12 May 2020 13:33:21 +0300 Subject: [PATCH 21/23] Move into image directory to enable automated testing See https://docs.docker.com/docker-hub/builds/automated-testing/ --- .travis.yml | 2 +- docker/readme.md | 3 --- .../docker-compose.test.yml} | 10 ++++++---- docker/wp-dev-lib/readme.md | 3 +++ 4 files changed, 10 insertions(+), 8 deletions(-) delete mode 100644 docker/readme.md rename docker/{docker-compose.yml => wp-dev-lib/docker-compose.test.yml} (56%) create mode 100644 docker/wp-dev-lib/readme.md diff --git a/.travis.yml b/.travis.yml index a09d600..e889b00 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ script: - composer test # Run linters for the wp-dev-lib files. - composer install --working-dir="tests/composer" # Test Composer integration setup. - composer test --working-dir="tests/composer" # Test Composer integration pre-commit hook. - - docker-compose --file=docker/docker-compose.yml run test # Test the Docker image. + - docker-compose --file=docker/wp-dev-lib/docker-compose.test.yml run sut # Test the Docker image. - cd tests/composer && export DEV_LIB_PATH=vendor/xwp/wp-dev-lib/scripts # We need Bash shell which might not be available in Composer scripts. - source "$DEV_LIB_PATH/travis.install.sh" - source "$DEV_LIB_PATH/travis.script.sh" diff --git a/docker/readme.md b/docker/readme.md deleted file mode 100644 index 410c8ce..0000000 --- a/docker/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Docker Image for wp-dev-lib - -This is a self-contained Docker container for running wp-dev-lib tasks. It bundles all services and software dependencies required for running the tasks. diff --git a/docker/docker-compose.yml b/docker/wp-dev-lib/docker-compose.test.yml similarity index 56% rename from docker/docker-compose.yml rename to docker/wp-dev-lib/docker-compose.test.yml index cc3662f..fafcb1a 100644 --- a/docker/docker-compose.yml +++ b/docker/wp-dev-lib/docker-compose.test.yml @@ -1,13 +1,15 @@ +# Used by Travis and Docker Hub to test the image. +# See https://docs.docker.com/docker-hub/builds/automated-testing/ + version: '3.6' services: - test: - build: ./wp-dev-lib + sut: + build: . working_dir: /var/www/html/tests/composer volumes: - - /tmp/wordpress - - ..:/var/www/html + - ../..:/var/www/html command: bash -c "composer install && composer test" environment: CHECK_SCOPE: all diff --git a/docker/wp-dev-lib/readme.md b/docker/wp-dev-lib/readme.md new file mode 100644 index 0000000..1101079 --- /dev/null +++ b/docker/wp-dev-lib/readme.md @@ -0,0 +1,3 @@ +# xwpco/wp-dev-lib + +This is a self-contained Docker image for running [`wp-dev-lib`](https://github.com/xwp/wp-dev-lib) tasks with all the required services and software dependencies. From 9e1669c906c223a0131d6e858a98a9e87a5bbd11 Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Tue, 12 May 2020 14:35:42 +0300 Subject: [PATCH 22/23] Do it as the very last thing since it takes a long time --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e889b00..6489de4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,8 @@ script: - composer test # Run linters for the wp-dev-lib files. - composer install --working-dir="tests/composer" # Test Composer integration setup. - composer test --working-dir="tests/composer" # Test Composer integration pre-commit hook. - - docker-compose --file=docker/wp-dev-lib/docker-compose.test.yml run sut # Test the Docker image. - cd tests/composer && export DEV_LIB_PATH=vendor/xwp/wp-dev-lib/scripts # We need Bash shell which might not be available in Composer scripts. - source "$DEV_LIB_PATH/travis.install.sh" - source "$DEV_LIB_PATH/travis.script.sh" - source "$DEV_LIB_PATH/travis.after_script.sh" + - docker-compose --file=docker/wp-dev-lib/docker-compose.test.yml run sut # Test the Docker image. From 17ef40c6f501de0284b5eab0c16ceeb9eb106699 Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Tue, 12 May 2020 15:50:47 +0300 Subject: [PATCH 23/23] Run before we change into directories --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6489de4..e889b00 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,8 @@ script: - composer test # Run linters for the wp-dev-lib files. - composer install --working-dir="tests/composer" # Test Composer integration setup. - composer test --working-dir="tests/composer" # Test Composer integration pre-commit hook. + - docker-compose --file=docker/wp-dev-lib/docker-compose.test.yml run sut # Test the Docker image. - cd tests/composer && export DEV_LIB_PATH=vendor/xwp/wp-dev-lib/scripts # We need Bash shell which might not be available in Composer scripts. - source "$DEV_LIB_PATH/travis.install.sh" - source "$DEV_LIB_PATH/travis.script.sh" - source "$DEV_LIB_PATH/travis.after_script.sh" - - docker-compose --file=docker/wp-dev-lib/docker-compose.test.yml run sut # Test the Docker image.