From 9c2552a9b32578e08fc2cf1008adebb132331c6e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 12 Jan 2024 03:23:43 +0000 Subject: [PATCH 1/2] Update Minor and Patch Contrib --- .drevops/installer/composer.lock | 142 ++++++++++++++++--------------- 1 file changed, 72 insertions(+), 70 deletions(-) diff --git a/.drevops/installer/composer.lock b/.drevops/installer/composer.lock index 34cfdb17d..5fb0fc64d 100644 --- a/.drevops/installer/composer.lock +++ b/.drevops/installer/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "6dbcba5c9bc55fad9f2b5c29dad87e34", + "content-hash": "82389d0dacac8c7a50be452b6c58f91e", "packages": [ { "name": "psr/container", @@ -61,16 +61,16 @@ }, { "name": "symfony/console", - "version": "v6.4.1", + "version": "v6.4.2", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "a550a7c99daeedef3f9d23fb82e3531525ff11fd" + "reference": "0254811a143e6bc6c8deea08b589a7e68a37f625" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/a550a7c99daeedef3f9d23fb82e3531525ff11fd", - "reference": "a550a7c99daeedef3f9d23fb82e3531525ff11fd", + "url": "https://api.github.com/repos/symfony/console/zipball/0254811a143e6bc6c8deea08b589a7e68a37f625", + "reference": "0254811a143e6bc6c8deea08b589a7e68a37f625", "shasum": "" }, "require": { @@ -135,7 +135,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.1" + "source": "https://github.com/symfony/console/tree/v6.4.2" }, "funding": [ { @@ -151,7 +151,7 @@ "type": "tidelift" } ], - "time": "2023-11-30T10:54:28+00:00" + "time": "2023-12-10T16:15:48+00:00" }, { "name": "symfony/deprecation-contracts", @@ -552,21 +552,21 @@ }, { "name": "symfony/service-contracts", - "version": "v3.4.0", + "version": "v3.4.1", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838" + "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/b3313c2dbffaf71c8de2934e2ea56ed2291a3838", - "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0", + "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0", "shasum": "" }, "require": { "php": ">=8.1", - "psr/container": "^2.0" + "psr/container": "^1.1|^2.0" }, "conflict": { "ext-psr": "<1.1|>=2" @@ -614,7 +614,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.4.0" + "source": "https://github.com/symfony/service-contracts/tree/v3.4.1" }, "funding": [ { @@ -630,20 +630,20 @@ "type": "tidelift" } ], - "time": "2023-07-30T20:28:31+00:00" + "time": "2023-12-26T14:02:43+00:00" }, { "name": "symfony/string", - "version": "v7.0.0", + "version": "v7.0.2", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "92bd2bfbba476d4a1838e5e12168bef2fd1e6620" + "reference": "cc78f14f91f5e53b42044d0620961c48028ff9f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/92bd2bfbba476d4a1838e5e12168bef2fd1e6620", - "reference": "92bd2bfbba476d4a1838e5e12168bef2fd1e6620", + "url": "https://api.github.com/repos/symfony/string/zipball/cc78f14f91f5e53b42044d0620961c48028ff9f5", + "reference": "cc78f14f91f5e53b42044d0620961c48028ff9f5", "shasum": "" }, "require": { @@ -700,7 +700,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v7.0.0" + "source": "https://github.com/symfony/string/tree/v7.0.2" }, "funding": [ { @@ -716,7 +716,7 @@ "type": "tidelift" } ], - "time": "2023-11-29T08:40:23+00:00" + "time": "2023-12-10T16:54:46+00:00" } ], "packages-dev": [ @@ -1104,25 +1104,27 @@ }, { "name": "nikic/php-parser", - "version": "v4.18.0", + "version": "v5.0.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999" + "reference": "4a21235f7e56e713259a6f76bf4b5ea08502b9dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999", - "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4a21235f7e56e713259a6f76bf4b5ea08502b9dc", + "reference": "4a21235f7e56e713259a6f76bf4b5ea08502b9dc", "shasum": "" }, "require": { + "ext-ctype": "*", + "ext-json": "*", "ext-tokenizer": "*", - "php": ">=7.0" + "php": ">=7.4" }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "bin": [ "bin/php-parse" @@ -1130,7 +1132,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.9-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -1154,9 +1156,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.0" }, - "time": "2023-12-10T21:03:43+00:00" + "time": "2024-01-07T17:17:35+00:00" }, { "name": "pdepend/pdepend", @@ -1464,16 +1466,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.50", + "version": "1.10.55", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "06a98513ac72c03e8366b5a0cb00750b487032e4" + "reference": "9a88f9d18ddf4cf54c922fbeac16c4cb164c5949" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/06a98513ac72c03e8366b5a0cb00750b487032e4", - "reference": "06a98513ac72c03e8366b5a0cb00750b487032e4", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9a88f9d18ddf4cf54c922fbeac16c4cb164c5949", + "reference": "9a88f9d18ddf4cf54c922fbeac16c4cb164c5949", "shasum": "" }, "require": { @@ -1522,27 +1524,27 @@ "type": "tidelift" } ], - "time": "2023-12-13T10:59:42+00:00" + "time": "2024-01-08T12:32:40+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "10.1.10", + "version": "10.1.11", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "599109c8ca6bae97b23482d557d2874c25a65e59" + "reference": "78c3b7625965c2513ee96569a4dbb62601784145" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/599109c8ca6bae97b23482d557d2874c25a65e59", - "reference": "599109c8ca6bae97b23482d557d2874c25a65e59", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/78c3b7625965c2513ee96569a4dbb62601784145", + "reference": "78c3b7625965c2513ee96569a4dbb62601784145", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.15", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=8.1", "phpunit/php-file-iterator": "^4.0", "phpunit/php-text-template": "^3.0", @@ -1592,7 +1594,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.10" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.11" }, "funding": [ { @@ -1600,7 +1602,7 @@ "type": "github" } ], - "time": "2023-12-11T06:28:43+00:00" + "time": "2023-12-21T15:38:30+00:00" }, { "name": "phpunit/php-file-iterator", @@ -1847,16 +1849,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.3", + "version": "10.5.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "6fce887c71076a73f32fd3e0774a6833fc5c7f19" + "reference": "ed21115d505b4b4f7dc7b5651464e19a2c7f7856" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6fce887c71076a73f32fd3e0774a6833fc5c7f19", - "reference": "6fce887c71076a73f32fd3e0774a6833fc5c7f19", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ed21115d505b4b4f7dc7b5651464e19a2c7f7856", + "reference": "ed21115d505b4b4f7dc7b5651464e19a2c7f7856", "shasum": "" }, "require": { @@ -1928,7 +1930,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.3" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.5" }, "funding": [ { @@ -1944,7 +1946,7 @@ "type": "tidelift" } ], - "time": "2023-12-13T07:25:23+00:00" + "time": "2023-12-27T15:13:52+00:00" }, { "name": "psr/log", @@ -2242,20 +2244,20 @@ }, { "name": "sebastian/complexity", - "version": "3.1.0", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/complexity.git", - "reference": "68cfb347a44871f01e33ab0ef8215966432f6957" + "reference": "68ff824baeae169ec9f2137158ee529584553799" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68cfb347a44871f01e33ab0ef8215966432f6957", - "reference": "68cfb347a44871f01e33ab0ef8215966432f6957", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68ff824baeae169ec9f2137158ee529584553799", + "reference": "68ff824baeae169ec9f2137158ee529584553799", "shasum": "" }, "require": { - "nikic/php-parser": "^4.10", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=8.1" }, "require-dev": { @@ -2264,7 +2266,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.1-dev" + "dev-main": "3.2-dev" } }, "autoload": { @@ -2288,7 +2290,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/complexity/issues", "security": "https://github.com/sebastianbergmann/complexity/security/policy", - "source": "https://github.com/sebastianbergmann/complexity/tree/3.1.0" + "source": "https://github.com/sebastianbergmann/complexity/tree/3.2.0" }, "funding": [ { @@ -2296,20 +2298,20 @@ "type": "github" } ], - "time": "2023-09-28T11:50:59+00:00" + "time": "2023-12-21T08:37:17+00:00" }, { "name": "sebastian/diff", - "version": "5.0.3", + "version": "5.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "912dc2fbe3e3c1e7873313cc801b100b6c68c87b" + "reference": "fbf413a49e54f6b9b17e12d900ac7f6101591b7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/912dc2fbe3e3c1e7873313cc801b100b6c68c87b", - "reference": "912dc2fbe3e3c1e7873313cc801b100b6c68c87b", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/fbf413a49e54f6b9b17e12d900ac7f6101591b7f", + "reference": "fbf413a49e54f6b9b17e12d900ac7f6101591b7f", "shasum": "" }, "require": { @@ -2322,7 +2324,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "5.0-dev" + "dev-main": "5.1-dev" } }, "autoload": { @@ -2355,7 +2357,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", "security": "https://github.com/sebastianbergmann/diff/security/policy", - "source": "https://github.com/sebastianbergmann/diff/tree/5.0.3" + "source": "https://github.com/sebastianbergmann/diff/tree/5.1.0" }, "funding": [ { @@ -2363,7 +2365,7 @@ "type": "github" } ], - "time": "2023-05-01T07:48:21+00:00" + "time": "2023-12-22T10:55:06+00:00" }, { "name": "sebastian/environment", @@ -2571,20 +2573,20 @@ }, { "name": "sebastian/lines-of-code", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/lines-of-code.git", - "reference": "649e40d279e243d985aa8fb6e74dd5bb28dc185d" + "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/649e40d279e243d985aa8fb6e74dd5bb28dc185d", - "reference": "649e40d279e243d985aa8fb6e74dd5bb28dc185d", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/856e7f6a75a84e339195d48c556f23be2ebf75d0", + "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0", "shasum": "" }, "require": { - "nikic/php-parser": "^4.10", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=8.1" }, "require-dev": { @@ -2617,7 +2619,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy", - "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.1" + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.2" }, "funding": [ { @@ -2625,7 +2627,7 @@ "type": "github" } ], - "time": "2023-08-31T09:25:50+00:00" + "time": "2023-12-21T08:38:20+00:00" }, { "name": "sebastian/object-enumerator", @@ -3534,7 +3536,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=8.1" + "php": ">=8.2" }, "platform-dev": [], "plugin-api-version": "2.6.0" From dfea86946e2f2bab104f4b39fdb64e64b4b4e999 Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Fri, 12 Jan 2024 14:33:05 +1100 Subject: [PATCH 2/2] [#1127] Updated CI job names to consists of hyphens only. --- .circleci/config.yml | 112 +++++++++++++-------------- .drevops/tests/bats/_helper.bash | 44 +++++------ tests/phpunit/CircleCiConfigTest.php | 2 +- 3 files changed, 79 insertions(+), 79 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 04792f713..3d9da681c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -197,7 +197,7 @@ jobs: #: $DREVOPS_CI_DB_CACHE_FALLBACK is used if the cache did not match $DREVOPS_CI_DB_CACHE_TIMESTAMP. #: This allows to rely on the cache from the previous days within the same #: branch. - database: &job_database + database: &job-database <<: *runner_config steps: - attach_workspace: @@ -269,8 +269,8 @@ jobs: - *db_cache_dir # Nightly database job. Same as above, but with additional variables set. - database_nightly: - <<: *job_database + database-nightly: + <<: *job-database environment: DREVOPS_DB_DOWNLOAD_SSH_FINGERPRINT: *db_ssh_fingerprint DREVOPS_DEPLOY_SSH_FINGERPRINT: *deploy_ssh_fingerprint @@ -388,7 +388,7 @@ jobs: path: *artifacts # Deploy tags. - deploy_tags: &job_deploy_tags + deploy-tags: &job-deploy-tags <<: *runner_config steps: - attach_workspace: @@ -408,7 +408,7 @@ jobs: #;< RENOVATEBOT # Self-hosted RenovateBot. # Add RENOVATE_TOKEN as an environment variable with GitHub access token in UI. - renovatebot_self_hosted: + renovatebot-self-hosted: docker: - image: renovate/renovate:36.108.0 environment: @@ -439,7 +439,7 @@ jobs: #----------------------------------------------------------------------------- # Test suite for DrevOps. #----------------------------------------------------------------------------- - drevops_dev_test: + drevops-dev-test: <<: *runner_config parallelism: 1 steps: @@ -462,7 +462,7 @@ jobs: name: Upload code coverage reports to Codecov command: codecov -Z -s /tmp/artifacts/coverage - drevops_dev_test_workflow: + drevops-dev-test-workflow: <<: *runner_config parallelism: 3 resource_class: large @@ -483,7 +483,7 @@ jobs: name: Upload code coverage reports to Codecov command: codecov -Z -s /tmp/artifacts/coverage - drevops_dev_test_deployment: + drevops-dev-test-deployment: <<: *runner_config parallelism: 2 steps: @@ -509,7 +509,7 @@ jobs: command: codecov -Z -s /tmp/artifacts/coverage # Run tests after 'build' job. - drevops_dev_test_postbuild: + drevops-dev-test-postbuild: <<: *runner_config parallelism: 1 steps: @@ -529,11 +529,11 @@ jobs: command: codecov -Z -s /tmp/artifacts/coverage # Deployment of feature branches and tags for DrevOps itself. - drevops_dev_deploy: + drevops-dev-deploy: <<: *job_deploy - drevops_dev_deploy_tags: - <<: *job_deploy_tags + drevops-dev-deploy-tags: + <<: *job-deploy-tags #----------------------------------------------------------------------------- # Launching and testing databases stored within Docker data image. @@ -558,8 +558,8 @@ jobs: # # Job to test creation of the image from DB dump file when using # DREVOPS_DB_DOCKER_IMAGE workflow. - drevops_dev_didi_database_fi: - <<: *job_database + drevops-dev-didi-database-fi: + <<: *job-database environment: DREVOPS_DB_DOWNLOAD_SOURCE: curl DREVOPS_DB_DOWNLOAD_FORCE: 1 @@ -575,52 +575,52 @@ jobs: DREVOPS_DB_DOCKER_IMAGE: drevops/drevops-mariadb-drupal-data-demo-destination-10.x # Use a separate tag to make sure that pushed image does not affect # other tests (pushing broken image as 'latest' would fail other tests). - DREVOPS_DOCKER_IMAGE_TAG: drevops_dev_didi_database_fi + DREVOPS_DOCKER_IMAGE_TAG: drevops-dev-didi-database-fi # Also, use this job to test pushing of the DB image to the Docker - # registry to mimic what database_nightly job would do. + # registry to mimic what database-nightly job would do. DREVOPS_EXPORT_DB_DOCKER_DEPLOY_PROCEED: 1 # Use custom cache key for this workflow to make sure that caches from # the main workflow are separated from this one. - DREVOPS_CI_DB_CACHE_BRANCH: drevops_dev_didi_fi + DREVOPS_CI_DB_CACHE_BRANCH: drevops-dev-didi-fi # Job to test creation of the image from the previous version of the image # when using database-in-Docker-image workflow. - drevops_dev_database_ii: - <<: *job_database + drevops-dev-database-ii: + <<: *job-database environment: DREVOPS_DB_DOWNLOAD_SOURCE: docker_registry DREVOPS_DB_DOWNLOAD_FORCE: 1 DREVOPS_DB_DOCKER_IMAGE: drevops/drevops-mariadb-drupal-data-demo-destination-10.x - DREVOPS_DOCKER_IMAGE_TAG: drevops_dev_database_ii + DREVOPS_DOCKER_IMAGE_TAG: drevops-dev-database-ii # Also, use this job to test pushing of the DB image to the Docker - # registry so mimic what database_nightly job would do. + # registry so mimic what database-nightly job would do. DREVOPS_EXPORT_DB_DOCKER_DEPLOY_PROCEED: 1 # Use custom cache key for this workflow to make sure that caches from # the main workflow are separated from this one. - DREVOPS_CI_DB_CACHE_BRANCH: drevops_dev_didi_ii + DREVOPS_CI_DB_CACHE_BRANCH: drevops-dev-didi-ii # Job to test build of the image from the previous stage of the image when # using database-in-Docker-image workflow. Overwriting just the DREVOPS_DB_DOCKER_IMAGE # variable should change the storage mechanisms, but preserve application-level # stack operation. - drevops_dev_didi_build_fi: + drevops-dev-didi-build-fi: <<: *job_build environment: DREVOPS_DB_DOCKER_IMAGE: drevops/drevops-mariadb-drupal-data-demo-destination-10.x:drevops_dev_didi_database_fi # Use custom cache key for this workflow to make sure that caches from # the main workflow are separated from this one. - DREVOPS_CI_DB_CACHE_BRANCH: drevops_dev_didi_fi - drevops_dev_didi_build_ii: + DREVOPS_CI_DB_CACHE_BRANCH: drevops-dev-didi-fi + drevops-dev-didi-build-ii: <<: *job_build environment: DREVOPS_DB_DOCKER_IMAGE: drevops/drevops-mariadb-drupal-data-demo-destination-10.x:drevops_dev_database_ii # Use custom cache key for this workflow to make sure that caches from # the main workflow are separated from this one. - DREVOPS_CI_DB_CACHE_BRANCH: drevops_dev_didi_ii + DREVOPS_CI_DB_CACHE_BRANCH: drevops-dev-didi-ii #----------------------------------------------------------------------------- # Publish docs to docs.drevops.com # @todo Move this to GitHub Actions. #----------------------------------------------------------------------------- - drevops_dev_deploy_docs: + drevops-dev-deploy-docs: <<: *runner_config steps: - checkout @@ -654,7 +654,7 @@ jobs: # Publish installer to install.drevops.com # @todo Move this to GitHub Actions. #----------------------------------------------------------------------------- - drevops_dev_deploy_installer: + drevops-dev-deploy-installer: <<: *runner_config steps: - checkout @@ -743,7 +743,7 @@ workflows: only: /^(main|master|develop)$|^feature\/[a-zA-z0-9\-\.\,]+|^ci.*|^deps\/.*|^(release|hotfix)\/[0-9]+(\.[0-9]+){2}(-rc\.[0-9]+)?$|^(release|hotfix)\/[0-9]{4}-[0-9]{2}-[0-9]{2}(\.[0-9]+)?$/ tags: ignore: /.*/ - - deploy_tags: + - deploy-tags: requires: - build filters: @@ -764,21 +764,21 @@ workflows: # Run unit and functional tests for DrevOps. # Note that these jobs must run within the "commit" workflow, because they # depend on the "build" job. - - drevops_dev_test: + - drevops-dev-test: filters: tags: only: /.*/ - - drevops_dev_test_workflow: + - drevops-dev-test-workflow: filters: tags: only: /.*/ # Run deployment tests for DrevOps. - - drevops_dev_test_deployment: + - drevops-dev-test-deployment: filters: tags: only: /.*/ # Run tests after 'build' job. - - drevops_dev_test_postbuild: + - drevops-dev-test-postbuild: requires: - build filters: @@ -786,11 +786,11 @@ workflows: only: /.*/ # Run actual deployment of DrevOps code to destination codebase (integration test). # @see https://github.com/drevops/drevops-destination - - drevops_dev_deploy: + - drevops-dev-deploy: requires: - build - - drevops_dev_test - - drevops_dev_test_workflow + - drevops-dev-test + - drevops-dev-test-workflow filters: branches: # Allowed branches: 7.x, 8.x, 9.x, feature/7.x-description, feature/8.x-description, feature/9.x-description @@ -799,11 +799,11 @@ workflows: ignore: /.*/ # Run actual deployment of DrevOps code to destination codebase (integration test). # @see https://github.com/drevops/drevops-destination - - drevops_dev_deploy_tags: + - drevops-dev-deploy-tags: requires: - build - - drevops_dev_test - - drevops_dev_test_workflow + - drevops-dev-test + - drevops-dev-test-workflow filters: branches: ignore: /.*/ @@ -811,11 +811,11 @@ workflows: only: /^[0-9]+(\.[0-9]+)+(-rc[0-9]+)?$/ # Build and publish DrevOps docs. - - drevops_dev_deploy_docs: + - drevops-dev-deploy-docs: requires: - build - - drevops_dev_test - - drevops_dev_test_workflow + - drevops-dev-test + - drevops-dev-test-workflow filters: branches: # 'main' or any branch with 'docs' in the name. @@ -824,9 +824,9 @@ workflows: only: /^[0-9]+(\.[0-9]+)+(-rc[0-9]+)?$/ # Publish DrevOps installer. - - drevops_dev_deploy_installer: + - drevops-dev-deploy-installer: requires: - - drevops_dev_test + - drevops-dev-test filters: branches: only: /^feature\/installer-update$/ @@ -834,26 +834,26 @@ workflows: only: /^[0-9]+(\.[0-9]+)+(-rc[0-9]+)?$/ # Test workflow to test DREVOPS_DB_DOCKER_IMAGE workflow for DB from file. - drevops_dev_didi_fi: + drevops-dev-didi-fi: jobs: - - drevops_dev_didi_database_fi - - drevops_dev_didi_build_fi: + - drevops-dev-didi-database-fi + - drevops-dev-didi-build-fi: requires: - - drevops_dev_didi_database_fi + - drevops-dev-didi-database-fi # Test workflow to test DREVOPS_DB_DOCKER_IMAGE workflow for DB from docker registry. - drevops_dev_didi_ii: + drevops-dev-didi-ii: jobs: - - drevops_dev_database_ii - - drevops_dev_didi_build_ii: + - drevops-dev-database-ii + - drevops-dev-didi-build-ii: requires: - - drevops_dev_database_ii + - drevops-dev-database-ii #============================================================================= #;> DREVOPS_DEV #;< !PROVISION_USE_PROFILE # Nightly database workflow runs overnight to capture fresh database and cache it. - nightly_db: + nightly-db: triggers: - schedule: cron: *nightly_db_schedule @@ -862,12 +862,12 @@ workflows: only: - *nightly_db_branch jobs: - - database_nightly + - database-nightly #;> !PROVISION_USE_PROFILE #;< RENOVATEBOT # Self-hosted Renovatebot workflow. - renovatebot_self_hosted: + renovatebot-self-hosted: triggers: - schedule: cron: *renovatebot_schedule @@ -876,5 +876,5 @@ workflows: only: - *renovatebot_branch jobs: - - renovatebot_self_hosted + - renovatebot-self-hosted #;> RENOVATEBOT diff --git a/.drevops/tests/bats/_helper.bash b/.drevops/tests/bats/_helper.bash index de3813bdd..4ff492415 100644 --- a/.drevops/tests/bats/_helper.bash +++ b/.drevops/tests/bats/_helper.bash @@ -417,19 +417,19 @@ assert_files_present_drevops() { assert_dir_not_exists ".drevops" assert_file_not_exists "LICENSE" assert_file_not_exists ".github/FUNDING.yml" - assert_file_not_contains ".circleci/config.yml" "drevops_dev_test" - assert_file_not_contains ".circleci/config.yml" "drevops_dev_test_workflow" - assert_file_not_contains ".circleci/config.yml" "drevops_dev_test_deployment" - assert_file_not_contains ".circleci/config.yml" "drevops_dev_deploy" - assert_file_not_contains ".circleci/config.yml" "drevops_dev_deploy_tags" - assert_file_not_contains ".circleci/config.yml" "drevops_dev_didi_database_fi" - assert_file_not_contains ".circleci/config.yml" "drevops_dev_database_ii" - assert_file_not_contains ".circleci/config.yml" "drevops_dev_didi_build_fi" - assert_file_not_contains ".circleci/config.yml" "drevops_dev_didi_build_ii" - assert_file_not_contains ".circleci/config.yml" "drevops_dev_docs" - assert_file_not_contains ".circleci/config.yml" "drevops_dev_didi_fi" - assert_file_not_contains ".circleci/config.yml" "drevops_dev_didi_ii" - assert_file_not_contains ".circleci/config.yml" "drevops_dev_installer" + assert_file_not_contains ".circleci/config.yml" "drevops-dev-test" + assert_file_not_contains ".circleci/config.yml" "drevops-dev-test-workflow" + assert_file_not_contains ".circleci/config.yml" "drevops-dev-test-deployment" + assert_file_not_contains ".circleci/config.yml" "drevops-dev-deploy" + assert_file_not_contains ".circleci/config.yml" "drevops-dev-deploy-tags" + assert_file_not_contains ".circleci/config.yml" "drevops-dev-didi-database-fi" + assert_file_not_contains ".circleci/config.yml" "drevops-dev-database-ii" + assert_file_not_contains ".circleci/config.yml" "drevops-dev-didi-build-fi" + assert_file_not_contains ".circleci/config.yml" "drevops-dev-didi-build-ii" + assert_file_not_contains ".circleci/config.yml" "drevops-dev-docs" + assert_file_not_contains ".circleci/config.yml" "drevops-dev-didi-fi" + assert_file_not_contains ".circleci/config.yml" "drevops-dev-didi-ii" + assert_file_not_contains ".circleci/config.yml" "drevops-dev-installer" # Assert that documentation was processed correctly. assert_file_not_contains README.md "# DrevOps" @@ -607,8 +607,8 @@ assert_files_present_provision_use_profile() { assert_file_not_contains ".circleci/config.yml" "DREVOPS_CI_DB_CACHE_TIMESTAMP" assert_file_not_contains ".circleci/config.yml" "DREVOPS_CI_DB_CACHE_FALLBACK" assert_file_not_contains ".circleci/config.yml" "DREVOPS_CI_DB_CACHE_BRANCH" - assert_file_not_contains ".circleci/config.yml" "database: &job_database" - assert_file_not_contains ".circleci/config.yml" "database_nightly" + assert_file_not_contains ".circleci/config.yml" "database: &job-database" + assert_file_not_contains ".circleci/config.yml" "database-nightly" assert_file_not_contains ".circleci/config.yml" "name: Set cache keys for database caching" assert_file_not_contains ".circleci/config.yml" "- database:" @@ -639,8 +639,8 @@ assert_files_present_no_provision_use_profile() { assert_file_contains ".circleci/config.yml" "DREVOPS_CI_DB_CACHE_TIMESTAMP" assert_file_contains ".circleci/config.yml" "DREVOPS_CI_DB_CACHE_FALLBACK" assert_file_contains ".circleci/config.yml" "DREVOPS_CI_DB_CACHE_BRANCH" - assert_file_contains ".circleci/config.yml" "database: &job_database" - assert_file_contains ".circleci/config.yml" "database_nightly" + assert_file_contains ".circleci/config.yml" "database: &job-database" + assert_file_contains ".circleci/config.yml" "database-nightly" assert_file_contains ".circleci/config.yml" "name: Set cache keys for database caching" assert_file_contains ".circleci/config.yml" "- database:" @@ -677,7 +677,7 @@ assert_files_present_deployment() { assert_file_exists "docs/deployment.md" assert_file_contains ".circleci/config.yml" "deploy: &job_deploy" - assert_file_contains ".circleci/config.yml" "deploy_tags: &job_deploy_tags" + assert_file_contains ".circleci/config.yml" "deploy-tags: &job-deploy-tags" popd >/dev/null || exit 1 } @@ -696,9 +696,9 @@ assert_files_present_no_deployment() { # committed. if [ "${has_committed_files:-}" -eq 0 ]; then assert_file_not_contains ".circleci/config.yml" "deploy: &job_deploy" - assert_file_not_contains ".circleci/config.yml" "deploy_tags: &job_deploy_tags" + assert_file_not_contains ".circleci/config.yml" "deploy-tags: &job-deploy-tags" assert_file_not_contains ".circleci/config.yml" "- deploy:" - assert_file_not_contains ".circleci/config.yml" "- deploy_tags:" + assert_file_not_contains ".circleci/config.yml" "- deploy-tags:" fi popd >/dev/null || exit 1 @@ -862,7 +862,7 @@ assert_files_present_integration_renovatebot() { assert_file_exists "renovate.json" - assert_file_contains ".circleci/config.yml" "renovatebot_self_hosted" + assert_file_contains ".circleci/config.yml" "renovatebot-self-hosted" assert_file_contains ".circleci/config.yml" "renovatebot_branch" assert_file_contains ".circleci/config.yml" "- *renovatebot_branch" @@ -877,7 +877,7 @@ assert_files_present_no_integration_renovatebot() { assert_file_not_exists "renovate.json" - assert_file_not_contains ".circleci/config.yml" "renovatebot_self_hosted" + assert_file_not_contains ".circleci/config.yml" "renovatebot-self-hosted" assert_file_not_contains ".circleci/config.yml" "renovatebot_branch" assert_file_not_contains ".circleci/config.yml" "- *renovatebot_branch" diff --git a/tests/phpunit/CircleCiConfigTest.php b/tests/phpunit/CircleCiConfigTest.php index d0a8f438c..1c97274e3 100644 --- a/tests/phpunit/CircleCiConfigTest.php +++ b/tests/phpunit/CircleCiConfigTest.php @@ -180,7 +180,7 @@ public function dataProviderDeployBranchRegex(): array { * @dataProvider dataProviderDeployTagRegex */ public function testDeployTagRegex(string $branch, bool $expected = TRUE): void { - $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][3]['deploy_tags']['filters']['tags']['only'], $branch)); + $this->assertEquals($expected, preg_match($this->config['workflows']['commit']['jobs'][3]['deploy-tags']['filters']['tags']['only'], $branch)); } /**