From 7a2a716b24d97ffd31a3ac818a7814c8e6a406c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Vannicatte?= Date: Mon, 4 Jul 2022 11:29:26 +0200 Subject: [PATCH] fix matrix run conditions --- .github/.cache_version | 2 +- config/generation.config.js | 13 +++++-------- scripts/ci/githubActions/createMatrix.ts | 7 +------ scripts/ci/husky/__tests__/pre-commit.test.js | 1 - 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/.github/.cache_version b/.github/.cache_version index c5d54ec326..7c1886bb9f 100644 --- a/.github/.cache_version +++ b/.github/.cache_version @@ -1 +1 @@ -0.0.9 +0.0.10 diff --git a/config/generation.config.js b/config/generation.config.js index 9a322fda12..e03a538f6f 100644 --- a/config/generation.config.js +++ b/config/generation.config.js @@ -28,13 +28,10 @@ module.exports = { // PHP '!clients/algoliasearch-client-php/*', - '!clients/algoliasearch-client-php/lib/*', - '!clients/algoliasearch-client-php/lib/Cache/**', - '!clients/algoliasearch-client-php/lib/Exceptions/**', - '!clients/algoliasearch-client-php/lib/Http/**', - '!clients/algoliasearch-client-php/lib/Log/**', - '!clients/algoliasearch-client-php/lib/RequestOptions/**', - '!clients/algoliasearch-client-php/lib/RetryStrategy/**', - '!clients/algoliasearch-client-php/lib/Support/**', + 'clients/algoliasearch-client-php/lib/Api/*', + 'clients/algoliasearch-client-php/lib/Model/**', + 'clients/algoliasearch-client-php/lib/Configuration/*', + 'clients/algoliasearch-client-php/lib/ApiException.php', + 'clients/algoliasearch-client-php/lib/ObjectSerializer.php', ], }; diff --git a/scripts/ci/githubActions/createMatrix.ts b/scripts/ci/githubActions/createMatrix.ts index f06bd8b68b..439991bb39 100644 --- a/scripts/ci/githubActions/createMatrix.ts +++ b/scripts/ci/githubActions/createMatrix.ts @@ -128,12 +128,7 @@ async function getSpecMatrix(): Promise { }; for (const client of CLIENTS) { - // `algoliasearch` is an aggregation of client - if (client === 'algoliasearch') { - continue; - } - - // The `lite` spec is created by the `search` spec + // The `algoliasearch` spec is created by the `search` spec, for the `lite` JavaScript client. const bundledSpecName = client === 'algoliasearch' ? 'search' : client; matrix.toRun.push(client); diff --git a/scripts/ci/husky/__tests__/pre-commit.test.js b/scripts/ci/husky/__tests__/pre-commit.test.js index 83c5f079e9..d89e6b9902 100644 --- a/scripts/ci/husky/__tests__/pre-commit.test.js +++ b/scripts/ci/husky/__tests__/pre-commit.test.js @@ -24,7 +24,6 @@ describe('micromatch', () => { 'clients/algoliasearch-client-php/.gitignore', 'clients/algoliasearch-client-php/lib/Api/SearchClient.php', - 'clients/algoliasearch-client-php/lib/Cache/FileCacheDriver.php', 'tests/output/java/build.gradle', 'tests/output/java/settings.gradle',