From 10fd6386c1ffc0c63e1d75bb80b4c1c1dbee3cba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20de=20Guillebon?= Date: Thu, 25 Nov 2021 12:45:45 +0100 Subject: [PATCH] Simplify github action matrix (#2025) * Simplify github action matrix * Add changelog --- .github/workflows/continuous-integration.yaml | 19 ++++++++----------- CHANGELOG.md | 1 + 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index f552a8d15e..4ac760252d 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -30,17 +30,14 @@ jobs: timeout-minutes: 10 strategy: matrix: - include: - - php: '7.2' - elasticsearch: '7.14.1' - - php: '7.3' - elasticsearch: '7.14.1' - - php: '7.4' - elasticsearch: '7.14.1' - - php: '8.0' - elasticsearch: '7.14.1' - - php: '8.1' - elasticsearch: '7.14.1' + php: + - '7.2' + - '7.3' + - '7.4' + - '8.0' + - '8.1' + elasticsearch: + - '7.14.1' fail-fast: false steps: - name: 'Checkout' diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f2d7e21ac..217ba5608c 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * Updated `composer-normalize` to `2.15.0` [#2021](https://github.com/ruflin/Elastica/pull/2021) * Extracted setting gap policy to `\Elastica\Aggregation\Traits\GapPolicyTrait` and introduced `\Elastica\Aggregation\GapPolicyInterface` with constants for options [#2023](https://github.com/ruflin/Elastica/pull/2023) * Extracted setting `target_field` to `Elastica\Processor\Traits\TargetFieldTrait` [#2026](https://github.com/ruflin/Elastica/pull/2026) +* Simplified github action matrix for continuous integration workflow [#2025](https://github.com/ruflin/Elastica/pull/2025) ### Deprecated * Deprecated `Elastica\Query\Common` class, use `Elastica\Query\MatchQuery` instead [#2013](https://github.com/ruflin/Elastica/pull/2013) * Deprecated `Elastica\QueryBuilder\DSL\Query::common_terms()`, use `match()` instead [#2013](https://github.com/ruflin/Elastica/pull/2013)