Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
lcharette committed Mar 6, 2021
2 parents 4fcff0f + cf651f3 commit 4d00974
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 3 deletions.
15 changes: 12 additions & 3 deletions .github/workflows/Build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php_versions }}
extensions: mbstring, dom, fileinfo, gd, memcached, redis
extensions: mbstring, dom, fileinfo, gd, memcached, redis, pdo_sqlite
coverage: xdebug
tools: pecl, composer:v1

Expand Down Expand Up @@ -72,6 +72,12 @@ jobs:
mysql database: 'userfrosting'
mysql user: 'userfrosting'
mysql password: 'password'

- name: Wait for MySQL
run: |
while ! mysqladmin ping --host=127.0.0.1 --password=password --silent; do
sleep 1
done
- name: Copy .env
run: php -r "copy('app/sprinkles.example.json', 'app/sprinkles.json');"
Expand All @@ -92,6 +98,7 @@ jobs:
run: app/vendor/bin/phpunit --coverage-clover=coverage.xml

- name: Upload coverage to Codecov
if: github.event_name != 'schedule'
uses: codecov/codecov-action@v1
with:
file: ./coverage.xml
Expand Down Expand Up @@ -120,7 +127,7 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php_versions }}
extensions: mbstring, dom, fileinfo, gd, memcached, redis
extensions: mbstring, dom, fileinfo, gd, memcached, redis, pdo_sqlite
coverage: xdebug
tools: pecl, composer:v1

Expand Down Expand Up @@ -160,6 +167,7 @@ jobs:
run: app/vendor/bin/phpunit --coverage-clover=coverage.xml

- name: Upload coverage to Codecov
if: github.event_name != 'schedule'
uses: codecov/codecov-action@v1
with:
file: ./coverage.xml
Expand Down Expand Up @@ -192,7 +200,7 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php_versions }}
extensions: mbstring, dom, fileinfo, gd, memcached, redis
extensions: mbstring, dom, fileinfo, gd, memcached, redis, pdo_sqlite, pdo_pgsql
coverage: xdebug
tools: pecl, composer:v1

Expand Down Expand Up @@ -234,6 +242,7 @@ jobs:
run: app/vendor/bin/phpunit --coverage-clover=coverage.xml

- name: Upload coverage to Codecov
if: github.event_name != 'schedule'
uses: codecov/codecov-action@v1
with:
file: ./coverage.xml
Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Removed support for migration with non static `$dependencies` properties.
- Removed support for deprecared `determineRedirectOnLogin` service (deprecated in 4.1.10).

## [v4.4.5]

### Changed
- Replaced Travis with Github Actions
- Force Composer 1.0 for Docker ([#1126])
- Update error.html.twig - add container ([#1128])
- Update some tests
- Update Vagrant doc & config

## [v4.4.4]

### Fixed
Expand Down Expand Up @@ -1018,6 +1027,8 @@ See [http://learn.userfrosting.com/upgrading/40-to-41](Upgrading 4.0.x to 4.1.x
[#1107]: https://github.com/userfrosting/UserFrosting/pull/1107
[#1109]: https://github.com/userfrosting/UserFrosting/pull/1109
[#1114]: https://github.com/userfrosting/UserFrosting/pull/1114
[#1126]: https://github.com/userfrosting/UserFrosting/pull/1126
[#1128]: https://github.com/userfrosting/UserFrosting/pull/1128

[v4.2.0]: https://github.com/userfrosting/UserFrosting/compare/v4.1.22...v4.2.0
[v4.2.1]: https://github.com/userfrosting/UserFrosting/compare/v4.2.0...v.4.2.1
Expand All @@ -1032,3 +1043,4 @@ See [http://learn.userfrosting.com/upgrading/40-to-41](Upgrading 4.0.x to 4.1.x
[v4.4.2]: https://github.com/userfrosting/UserFrosting/compare/v4.4.1...v4.4.2
[v4.4.3]: https://github.com/userfrosting/UserFrosting/compare/v4.4.2...v4.4.3
[v4.4.4]: https://github.com/userfrosting/UserFrosting/compare/v4.4.3...v4.4.4
[v4.4.5]: https://github.com/userfrosting/UserFrosting/compare/v4.4.4...v4.4.5

0 comments on commit 4d00974

Please sign in to comment.