Skip to content

Commit

Permalink
fix: osx CI
Browse files Browse the repository at this point in the history
Signed-off-by: William Desportes <williamdes@wdes.fr>
  • Loading branch information
williamdes committed Mar 20, 2019
1 parent 9ac6e9b commit b00a8b0
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 70 deletions.
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ CODEOWNERS
/.nyc_output
/.editorconfig
/.jshintrc
/.dependabot
22 changes: 15 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ script:
install:
- if [ "$CI_TYPE" != "mocha" ]; then flags="--ansi --prefer-dist --no-interaction --optimize-autoloader --no-suggest --no-progress"; fi
- if [ "$CI_TYPE" != "mocha" ]; then composer install $flags; fi
- if [ "$CI_TYPE" = "mocha" ]; then npm install; fi
- if [ "$CI_TYPE" = "mocha" ]; then npm ci; fi
after_script:
- if [ "$CI_TYPE" != "cron" ]; then ./codacy-coverage.phar clover build/logs/clover.xml; else echo "skipped codacy"; fi
stages:
Expand All @@ -30,9 +30,9 @@ jobs:
env: CI_TYPE=phpcs
name: 'PHPCS - PHP 7.2'
- stage: tests
php: '7.2'
php: '7.1'
env: CI_TYPE=phpunit
name: 'PHPUNIT - PHP 7.2'
name: 'PHPUNIT - PHP 7.1'
after_success:
- bash <(curl -s https://codecov.io/bash) -cF php
- stage: tests
Expand All @@ -43,12 +43,20 @@ jobs:
- bash <(curl -s https://codecov.io/bash) -cF php
- stage: tests
os: osx
language: generic
php: '7.2'
language: node_js
node_js: 10
env: CI_TYPE=phpunit
name: 'PHPUNIT - PHP 7.2'
name: 'PHPUNIT - PHP 7.1'
addons:
homebrew:
packages:
- php@7.1
- composer
before_install:
- './scripts/ci/install-osx.sh'
- mkdir ~/.homebrew_logs
- export HOMEBREW_LOGS="~/.homebrew_logs"
- export HOMEBREW_TEMP="/tmp"
- export HOMEBREW_INSTALL_BADGE="🌻"
after_success:
- bash <(curl -s https://codecov.io/bash) -cF php
- stage: robot
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"php": "^7.1"
},
"require-dev": {
"phpunit/phpunit": "^8.0",
"phpunit/phpunit": "^7.0 || ^8.0",
"phpstan/phpstan": "^0.11.3",
"slevomat/coding-standard": "^5.0",
"squizlabs/php_codesniffer": "^3.3",
Expand Down
107 changes: 53 additions & 54 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions scripts/ci/install-osx.sh

This file was deleted.

0 comments on commit b00a8b0

Please sign in to comment.