Skip to content

Commit

Permalink
Merge pull request #122 from phalcon/2.2.x
Browse files Browse the repository at this point in the history
2.2.1
  • Loading branch information
Jeckerson authored Aug 8, 2021
2 parents fb0e3bd + 78c0694 commit 4fd501c
Show file tree
Hide file tree
Showing 9 changed files with 595 additions and 372 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ on: [push, pull_request]

jobs:
run-tests-php7:
name: PHP ${{ matrix.php-versions }}
name: PHP ${{ matrix.php-versions }} with Phalcon ${{ matrix.phalcon-versions }}
runs-on: ubuntu-latest
env:
extensions: mbstring, intl, json, phalcon-4.0.6, mysql, pgsql
extensions: mbstring, intl, json, phalcon-${{ matrix.phalcon-versions }}, mysql, pgsql
key: cache-v2.2~17.05.2020
services:
mysql:
Expand All @@ -27,6 +27,8 @@ jobs:
fail-fast: false
matrix:
php-versions: ['7.3', '7.4']
# There is no 4.1.1 version due release bug
phalcon-versions: ['4.0.5', '4.0.6', '4.1.0', '4.1.2']
steps:
- uses: actions/checkout@v1
- name: Setup cache environment
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# [2.2.2](https://github.com/phalcon/migrations/releases/tag/v2.2.2) (2021-08-08)
- Integrated nette/php-generator, changed algorithm of migrations generation ([#90](https://github.com/phalcon/migrations/issues/90))

# [2.2.1](https://github.com/phalcon/migrations/releases/tag/v2.2.1) (2021-08-03)
- Fixed types and indexes definition on pgsql adapter ([#111](https://github.com/phalcon/migrations/issues/111), [#112](https://github.com/phalcon/migrations/issues/112), [#118](https://github.com/phalcon/migrations/issues/118))

Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
"require": {
"php": ">=7.3",
"ext-phalcon": ">=4.0.5",
"phalcon/cli-options-parser": "^1.2"
"phalcon/cli-options-parser": "^1.2",
"nette/php-generator": "^3.5"
},
"require-dev": {
"ext-pdo": "*",
Expand Down
Loading

0 comments on commit 4fd501c

Please sign in to comment.