idanoo/php-resque
1
0
Fork 0
mirror of https://github.com/idanoo/php-resque.git synced 2024-11-22 00:11:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix paths

Browse Source
This commit is contained in:
Daniel Mason 2019-06-02 23:01:52 +12:00
parent 3b4d2e4c1f
commit 5a94c021da
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.gitlab-ci.yml
View File

@ -4,13 +4,18 @@
# Install git (the php image doesn't have it) which is required by composer # Install git (the php image doesn't have it) which is required by composer
apt-get update -yq apt-get update -yq
apt-get install git wget -y apt-get install git wget procps -y
# Install pcntl and redis extentions
pecl install -o -f redis \ pecl install -o -f redis \
&& rm -rf /tmp/pear \ && rm -rf /tmp/pear \
&& docker-php-ext-enable redis && docker-php-ext-enable redis
docker-php-ext-install pcntl docker-php-ext-install pcntl
# Hack to fix mismatched php versions
rm composer.lock
# Install Composer
wget https://getcomposer.org/composer.phar wget https://getcomposer.org/composer.phar
php composer.phar install php composer.phar install
@ -25,7 +30,7 @@ test:7.0:
script: script:
- curl --location --output /usr/local/bin/phpunit https://phar.phpunit.de/phpunit-6.5.9.phar - curl --location --output /usr/local/bin/phpunit https://phar.phpunit.de/phpunit-6.5.9.phar
- chmod +x /usr/local/bin/phpunit - chmod +x /usr/local/bin/phpunit
- phpunit --configuration phpunit.xml.dist - phpunit --verbose --configuration phpunit.xml.dist
tags: tags:
- docker - docker
@ -37,7 +42,7 @@ test:7.1:
script: script:
- curl --location --output /usr/local/bin/phpunit https://phar.phpunit.de/phpunit-7.5.9.phar - curl --location --output /usr/local/bin/phpunit https://phar.phpunit.de/phpunit-7.5.9.phar
- chmod +x /usr/local/bin/phpunit - chmod +x /usr/local/bin/phpunit
- phpunit --configuration phpunit.xml.dist - phpunit --verbose --configuration phpunit.xml.dist
tags: tags:
- docker - docker
@ -47,9 +52,9 @@ test:7.2:
before_script: before_script:
- *docker_boostrap - *docker_boostrap
script: script:
- curl --location --output /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar - curl --location --output /usr/local/bin/phpunit https://phar.phpunit.de/phpunit-7.5.9.phar
- chmod +x /usr/local/bin/phpunit - chmod +x /usr/local/bin/phpunit
- phpunit --configuration phpunit.xml.dist - phpunit --verbose --configuration phpunit.xml.dist
tags: tags:
- docker - docker
@ -61,6 +66,6 @@ test:7.3:
script: script:
- curl --location --output /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar - curl --location --output /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar
- chmod +x /usr/local/bin/phpunit - chmod +x /usr/local/bin/phpunit
- phpunit --configuration phpunit.xml.dist - phpunit --verbose --configuration phpunit.xml.dist
tags: tags:
- docker - docker

2
test/bootstrap.php
View File

@ -12,7 +12,7 @@ $loader->add('Resque_Tests', __DIR__);
# Redis configuration # Redis configuration
global $redisTestServer; global $redisTestServer;
$redisTestServer = getenv("REDIS_SERVER") ?? "redis"; $redisTestServer = getenv("REDIS_SERVER") ?: "redis";
Resque::setBackend($redisTestServer); Resque::setBackend($redisTestServer);
# Check Redis is accessable locally # Check Redis is accessable locally