1
0
mirror of https://github.com/Seldaek/monolog.git synced 2025-09-09 12:40:50 +02:00

Merge branch '2.x'

This commit is contained in:
Jordi Boggiano
2022-07-22 15:51:15 +02:00
21 changed files with 181 additions and 42 deletions

View File

@@ -4,6 +4,6 @@ about: Create a bug report
labels: Bug
---
Monolog version 1|2
Monolog version 1|2|3?
Write your bug report here.

View File

@@ -4,6 +4,6 @@ about: Ask a question regarding software usage
labels: Support
---
Monolog version 1|2
Monolog version 1|2|3?
Write your question here.

View File

@@ -6,7 +6,7 @@ on:
jobs:
tests:
name: "CI"
name: "CI (PHP ${{ matrix.php-version }}, ${{ matrix.dependencies }} deps)"
runs-on: "${{ matrix.operating-system }}"
@@ -19,6 +19,8 @@ jobs:
dependencies: [highest]
composer-options: [""]
operating-system:
- "ubuntu-latest"
@@ -26,6 +28,10 @@ jobs:
- php-version: "8.1"
dependencies: lowest
operating-system: ubuntu-latest
- php-version: "8.2"
dependencies: highest
operating-system: ubuntu-latest
composer-options: "--ignore-platform-req=php+"
steps:
- name: "Checkout"
@@ -61,9 +67,10 @@ jobs:
composer config --no-plugins allow-plugins.ocramius/package-versions true
- name: "Update dependencies with composer"
uses: "ramsey/composer-install@v1"
uses: "ramsey/composer-install@v2"
with:
dependency-versions: "${{ matrix.dependencies }}"
composer-options: "${{ matrix.composer-options }}"
- name: "Run tests"
run: "composer exec phpunit -- --exclude-group Elasticsearch,Elastica --verbose"
@@ -73,7 +80,7 @@ jobs:
run: |
composer remove --no-update --dev graylog2/gelf-php ruflin/elastica elasticsearch/elasticsearch rollbar/rollbar
composer require --no-update psr/log:^3
composer update -W
composer update ${{ matrix.composer-options }}
composer exec phpunit -- --exclude-group Elasticsearch,Elastica --verbose
tests-es-7:
@@ -131,8 +138,12 @@ jobs:
- name: "Change dependencies"
run: "composer require --no-update --no-interaction --dev elasticsearch/elasticsearch:^${{ matrix.es-version }}"
- name: "Allow composer plugin to run"
if: "matrix.php-version == '7.4' && matrix.dependencies == 'lowest'"
run: "composer config allow-plugins.ocramius/package-versions true"
- name: "Update dependencies with composer"
uses: "ramsey/composer-install@v1"
uses: "ramsey/composer-install@v2"
with:
dependency-versions: "${{ matrix.dependencies }}"
@@ -205,8 +216,12 @@ jobs:
composer remove --no-update --dev graylog2/gelf-php ruflin/elastica elasticsearch/elasticsearch rollbar/rollbar
composer require --no-update --no-interaction --dev elasticsearch/elasticsearch:^8
- name: "Allow composer plugin to run"
if: "matrix.php-version == '7.4' && matrix.dependencies == 'lowest'"
run: "composer config allow-plugins.ocramius/package-versions true"
- name: "Update dependencies with composer"
uses: "ramsey/composer-install@v1"
uses: "ramsey/composer-install@v2"
with:
dependency-versions: "${{ matrix.dependencies }}"