Skip to content

Commit

Permalink
Merge pull request #8 from netglue/php-8-and-ci
Browse files Browse the repository at this point in the history
Improve CI and Update dependencies
  • Loading branch information
gsteel authored Mar 3, 2021
2 parents 4bd81de + 6c6e800 commit 3391992
Show file tree
Hide file tree
Showing 7 changed files with 5,447 additions and 76 deletions.
33 changes: 33 additions & 0 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: "Continuous Integration"

on:
schedule:
- cron: '0 9 * * 1'
pull_request:
push:
branches:
- master

jobs:
matrix:
name: Generate job matrix
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.matrix.outputs.matrix }}
steps:
- name: Gather CI configuration
id: matrix
uses: laminas/laminas-ci-matrix-action@v1

qa:
name: QA Checks
needs: [matrix]
runs-on: ${{ matrix.operatingSystem }}
strategy:
fail-fast: false
matrix: ${{ fromJSON(needs.matrix.outputs.matrix) }}
steps:
- name: ${{ matrix.name }}
uses: laminas/laminas-continuous-integration-action@v1
with:
job: ${{ matrix.job }}
69 changes: 0 additions & 69 deletions .github/workflows/phpunit.yml

This file was deleted.

1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/build/
composer.lock
phpunit.xml
/vendor/
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,29 @@

All notable changes to this project will be documented in this file, in reverse chronological order by release.

## 0.5.1 - 2021-03-03

### Added

- Nothing.

### Changed

- [#8](https://github.com/netglue/primo/pull/8) Improves CI by using [the matrix action from the Laminas project](https://github.com/laminas/laminas-ci-matrix-action).
- [#8](https://github.com/netglue/primo/pull/8) Also updates dependencies, fixing test failures on 8 _(Out of date PHPUnit)_ and fixing a test failure due to copy/paste of a duplicate route name.

### Deprecated

- Nothing.

### Removed

- Nothing.

### Fixed

- Nothing.

## 0.5.0 - 2020-09-08

### Added
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@
}
},
"require": {
"php": ">= 7.3",
"php": "^7.3||^8.0",
"ext-json": "*",
"dflydev/fig-cookies": "^2.0",
"dflydev/fig-cookies": "^2.0||^3.0",
"laminas/laminas-diactoros": "^2.3",
"laminas/laminas-stdlib": "^3.2",
"mezzio/mezzio": "^3.2",
"mezzio/mezzio-helpers": "^5.3",
"mezzio/mezzio-router": "^3.1",
"mezzio/mezzio-template": "^2.0",
"netglue/prismic-client": "^0.4.0",
"netglue/prismic-client": "^0.5.0",
"psr/cache": "^1.0",
"psr/container": "^1.0",
"psr/event-dispatcher": "^1.0"
Expand All @@ -45,7 +45,7 @@
"mezzio/mezzio-fastroute": "^3.0",
"php-http/curl-client": "^2.1",
"php-http/mock-client": "^1.3",
"phpunit/phpunit": "^9.1",
"phpunit/phpunit": "^9.5",
"roave/security-advisories": "dev-master",
"squizlabs/php_codesniffer": "^3.5"
},
Expand Down
Loading

0 comments on commit 3391992

Please sign in to comment.