Skip to content

Commit

Permalink
Update illuminate up to 6.x (#2)
Browse files Browse the repository at this point in the history
  • Loading branch information
korobovn authored and tarampampam committed Oct 22, 2019
1 parent 6d4bd17 commit a944294
Show file tree
Hide file tree
Showing 6 changed files with 67 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Fixes # (issue)
- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I wrote unit tests for my code
- [ ] I wrote unit tests for my code _(if tests is required for my changes)_
- [ ] I have made changes in [CHANGELOG.md](https://github.com/avto-dev/vehicle-logotypes/blob/master/CHANGELOG.md) file

> About your changes in `CHANGELOG.md`:
Expand Down
46 changes: 46 additions & 0 deletions .github/workflows/execute-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Execute tests

on:
push:
branches:
- master
tags-ignore:
- '**'
pull_request:

jobs: # Docs: <https://help.github.com/en/articles/workflow-syntax-for-github-actions>
tests:
name: PHP ${{ matrix.php }}, ${{ matrix.setup }} setup
runs-on: ubuntu-latest
timeout-minutes: 10
strategy:
matrix:
setup: ['basic', 'lowest']
php: ['7.1', '7.2', '7.3']
steps:
- name: Check out code
uses: actions/checkout@v1
with:
fetch-depth: 1

- name: Setup PHP, with composer and extensions
uses: shivammathur/setup-php@master # Action page: <https://github.com/shivammathur/setup-php>
with:
php-version: ${{ matrix.php }}

- name: Install Composer 'hirak/prestissimo' package
run: composer global require hirak/prestissimo --update-no-dev

- name: Install lowest Composer dependencies
if: matrix.setup == 'lowest'
run: composer update --prefer-dist --no-interaction --no-suggest --prefer-lowest

- name: Install basic Composer dependencies
if: matrix.setup == 'basic'
run: composer update --prefer-dist --no-interaction --no-suggest

- name: Show most important packages versions
run: composer info | grep -e laravel/laravel -e phpunit/phpunit -e phpstan/phpstan

- name: Execute tests
run: composer test
9 changes: 8 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ env:
global:
- setup=basic
- coverage=false
- illuminate=default

sudo: false

Expand All @@ -20,9 +21,11 @@ before_install:
- if [[ $coverage = 'false' ]]; then phpenv config-rm xdebug.ini || true; fi

install:
- if [[ $setup = 'basic' ]]; then travis_retry composer update --prefer-dist --no-interaction --no-suggest; fi
- if [[ $setup = 'basic' ]] && [[ $illuminate = 'default' ]]; then travis_retry composer update --prefer-dist --no-interaction --no-suggest; fi
- if [[ $setup = 'stable' ]]; then travis_retry composer update --prefer-dist --no-interaction --no-suggest --prefer-stable; fi
- if [[ $setup = 'lowest' ]]; then travis_retry composer update --prefer-dist --no-interaction --no-suggest --prefer-lowest; fi
- if [[ $illuminate != 'default' ]]; then travis_retry composer require --dev --update-with-dependencies --prefer-dist --no-interaction --no-suggest illuminate/support "$illuminate"; fi
- composer info | grep -e illuminate/support -e phpunit/phpunit -e phpstan/phpstan

script:
- if [[ $coverage = 'true' ]]; then composer test-cover; else composer test; fi
Expand All @@ -42,10 +45,14 @@ matrix:
env: setup=lowest
- php: 7.2
env: setup=stable
- php: 7.2
env: illuminate=6.*

- php: 7.3
- php: 7.3
env: setup=lowest
- php: 7.3
env: illuminate=6.*

- php: nightly

Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog][keepachangelog] and this project adheres to [Semantic Versioning][semver].

## v2.1.0

### Changed

- Maximal `illuminate/*` packages version now is `6.*`

### Added

- GitHub actions for a tests running

## v2.0.0

### Added
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM composer:1.8.6 AS composer

FROM php:7.1.3-alpine
FROM php:7.2.0-alpine

ENV \
COMPOSER_ALLOW_SUPERUSER="1" \
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"require": {
"php": "^7.1.3",
"ext-json": "*",
"illuminate/support": ">=5.4.0 <5.9.0",
"illuminate/support": ">=5.4.0 <5.9.0 || ~6.0",
"tarampampam/wrappers-php": "^1.3"
},
"require-dev": {
Expand Down

0 comments on commit a944294

Please sign in to comment.