Switched back to config.yml.

Author: AlexSkrypnyk

.circleci/build-test-deploy.yml .circleci/config.yml.circleci/build-test-deploy.yml renamed to .circleci/config.yml

@@ -7,15 +7,6 @@
 # containers defined in `docker-compose.yml` run on a *remote* Docker server
 # controlled by CircleCI.
 # The "runner" container uses Docker client to control the remote Docker server.
-#
-# Scheduled pipelines:
-# The `nightly-db` workflow requires a schedule trigger configured in CircleCI UI.
-# Go to Project Settings > Triggers > Add Scheduled Trigger:
-#   - Trigger name: nightly-db
-#   - Config source: build-test-deploy.yml
-#   - Branch: develop
-#   - Schedule: Every day at 18:00 UTC (or a custom time)
-# See https://www.vortextemplate.com/docs/continuous-integration/circleci
 #;
 #; Comments starting with '#;<' and '#;>' are internal Vortex comments
 #; and will be removed during installation or update of Vortex.
@@ -32,6 +23,11 @@ aliases:
   # Replace this key fingerprint with your own and remove this comment.
   - &deploy_ssh_fingerprint "SHA256:6d+U5QubT0eAWz+4N2wt+WM2qx6o4cvyvQ6xILETJ84"
 
+  #;< !PROVISION_TYPE_PROFILE
+  # Schedule to run nightly database build (to cache the database for the next day).
+  - &nightly_db_schedule "0 18 * * *"
+  #;> !PROVISION_TYPE_PROFILE
+
   # Shared runner container configuration applied to each job.
   - &runner_config
     working_directory: &working_directory ~/project
@@ -575,9 +571,6 @@ jobs:
 workflows:
   # Commit workflow. Runs for every commit push to the remote repository.
   commit:
-    when:
-      not:
-        equal: [scheduled_pipeline, << pipeline.trigger_source >>]
     jobs:
       #;< !PROVISION_TYPE_PROFILE
       - database:
@@ -645,12 +638,14 @@ workflows:
 
   #;< !PROVISION_TYPE_PROFILE
   # Nightly database workflow runs overnight to capture fresh database and cache it.
-  # Requires a "nightly-db" schedule trigger configured in CircleCI UI.
   nightly-db:
-    when:
-      and:
-        - equal: [scheduled_pipeline, << pipeline.trigger_source >>]
-        - equal: ["nightly-db", << pipeline.schedule.name >>]
+    triggers:
+      - schedule:
+          cron: *nightly_db_schedule
+          filters:
+            branches:
+              only:
+                - develop
     jobs:
       - database-nightly
   #;> !PROVISION_TYPE_PROFILE

.circleci/vortex-test-common.yml

@@ -1,5 +1,5 @@
 # Auto-generated by .vortex/tests/generate-vortex-dev-circleci
-# Source: .circleci/build-test-deploy.yml
+# Source: .circleci/config.yml
 # Do not edit directly.
 version: '2.1'
 
@@ -14,6 +14,11 @@ aliases:
   # Replace this key fingerprint with your own and remove this comment.
   - &deploy_ssh_fingerprint "SHA256:6d+U5QubT0eAWz+4N2wt+WM2qx6o4cvyvQ6xILETJ84"
 
+  #;< !PROVISION_TYPE_PROFILE
+  # Schedule to run nightly database build (to cache the database for the next day).
+  - &nightly_db_schedule "0 18 * * *"
+  #;> !PROVISION_TYPE_PROFILE
+
   # Shared runner container configuration applied to each job.
   - &runner_config
     working_directory: &working_directory ~/project

.vortex/docs/content/continuous-integration/circleci.mdx

@@ -84,7 +84,7 @@ same provider, you can use a single key for both operations.
 
 CircleCI uses SSH key fingerprints to load the correct keys into the runner
 container. Update the YAML anchors in your
-[`.circleci/build-test-deploy.yml`](https://github.com/drevops/vortex/blob/main/.circleci/build-test-deploy.yml)
+[`.circleci/config.yml`](https://github.com/drevops/vortex/blob/main/.circleci/config.yml)
 file:
 
 - `db_ssh_fingerprint` - your database download SSH key fingerprint
@@ -103,29 +103,12 @@ Add the following variables in **Project Settings → Environment Variables**:
 
 ### 6. Configure schedule triggers
 
-Some workflows run on a schedule rather than on every push. These schedules must
-be configured in the CircleCI UI.
+If you use the self-hosted Renovate workflow for automatic dependency updates,
+the `update-dependencies.yml` pipeline requires a schedule trigger configured
+in the CircleCI UI. Without this trigger, the workflow will not run.
 
 Go to **Project Settings → Triggers** and create the following scheduled
-triggers:
-
-#### Nightly database
-
-Caches a fresh database dump overnight so that builds the next day start faster.
-
-| Setting       | Value                       |
-|---------------|-----------------------------|
-| Trigger name  | `nightly-db`                |
-| Config source | `build-test-deploy.yml`     |
-| Branch        | `develop`                   |
-| Schedule      | Every day at 18:00 UTC      |
-
-#### Update dependencies (optional)
-
-Runs [Renovate](https://docs.renovatebot.com/) to automatically update
-project dependencies. Only needed if you use the self-hosted Renovate
-workflow provided in
-[`.circleci/update-dependencies.yml`](https://github.com/drevops/vortex/blob/main/.circleci/update-dependencies.yml).
+trigger:
 
 | Setting       | Value                              |
 |---------------|------------------------------------|
@@ -136,8 +119,16 @@ workflow provided in
 
 :::note
 
-The trigger names (`nightly-db`, `update-dependencies`) must match exactly -
-they are referenced in the workflow `when` conditions in the configuration files.
+The trigger name `update-dependencies` must match exactly - it is referenced
+in the workflow `when` condition in the configuration file.
+
+:::
+
+:::tip
+
+The nightly database schedule is defined directly in `.circleci/config.yml`
+using the `nightly_db_schedule` YAML anchor. No UI configuration is needed
+for this schedule.
 
 :::
 
@@ -147,7 +138,7 @@ they are referenced in the workflow `when` conditions in the configuration files
 
 The `deploy` job only runs for specific branch patterns. To modify which branches
 trigger deployments, update the `only` filter regex in the `deploy` job under
-the `workflows` section of `.circleci/build-test-deploy.yml`:
+the `workflows` section of `.circleci/config.yml`:
 
 ```yaml
 filters:
@@ -158,11 +149,13 @@ filters:
 ### Update nightly database schedule
 
 The nightly database job caches a fresh database dump for faster builds the next
-day. To change the schedule, update the trigger in the CircleCI UI under
-**Project Settings → Triggers → nightly-db**.
+day. To change when this runs, update the `nightly_db_schedule` YAML anchor
+in `.circleci/config.yml`
+([cron format](https://crontab.guru/#0_18_*_*_*), UTC timezone):
 
-See [Configure schedule triggers](#6-configure-schedule-triggers) for the
-recommended default values.
+```yaml
+- &nightly_db_schedule "0 18 * * *"  # 6 PM UTC daily
+```
 
 ### Change runner resource class
 

.vortex/installer/src/Prompts/Handlers/CiProvider.php

@@ -64,7 +64,7 @@ public function discover(): null|string|bool|array {
       return self::GITHUB_ACTIONS;
     }
 
-    if (is_readable($this->dstDir . '/.circleci/build-test-deploy.yml') || is_readable($this->dstDir . '/.circleci/config.yml')) {
+    if (is_readable($this->dstDir . '/.circleci/config.yml')) {
       return self::CIRCLECI;
     }
 

.vortex/installer/src/Prompts/Handlers/DependencyUpdatesProvider.php

@@ -62,8 +62,7 @@ public function discover(): null|string|bool|array {
       return self::RENOVATEBOT_CI;
     }
 
-    if (File::contains($this->dstDir . '/.circleci/build-test-deploy.yml', 'update-dependencies')
-      || File::contains($this->dstDir . '/.circleci/config.yml', 'update-dependencies')) {
+    if (File::contains($this->dstDir . '/.circleci/config.yml', 'update-dependencies')) {
       return self::RENOVATEBOT_CI;
     }
 

…circleci/.circleci/build-test-deploy.yml …ciprovider_circleci/.circleci/config.yml.vortex/installer/tests/Fixtures/handler_process/deps_updates_provider_ci_circleci/.circleci/build-test-deploy.yml renamed to .vortex/installer/tests/Fixtures/handler_process/ciprovider_circleci/.circleci/config.yml .vortex/installer/tests/Fixtures/handler_process/deps_updates_provider_ci_circleci/.circleci/build-test-deploy.yml renamed to .vortex/installer/tests/Fixtures/handler_process/ciprovider_circleci/.circleci/config.yml

@@ -7,15 +7,6 @@
 # containers defined in `docker-compose.yml` run on a *remote* Docker server
 # controlled by CircleCI.
 # The "runner" container uses Docker client to control the remote Docker server.
-#
-# Scheduled pipelines:
-# The `nightly-db` workflow requires a schedule trigger configured in CircleCI UI.
-# Go to Project Settings > Triggers > Add Scheduled Trigger:
-#   - Trigger name: nightly-db
-#   - Config source: build-test-deploy.yml
-#   - Branch: develop
-#   - Schedule: Every day at 18:00 UTC (or a custom time)
-# See https://www.vortextemplate.com/docs/continuous-integration/circleci
 version: '2.1'
 
 aliases:
@@ -27,6 +18,9 @@ aliases:
   # Replace this key fingerprint with your own and remove this comment.
   - &deploy_ssh_fingerprint "SHA256:6d+U5QubT0eAWz+4N2wt+WM2qx6o4cvyvQ6xILETJ84"
 
+  # Schedule to run nightly database build (to cache the database for the next day).
+  - &nightly_db_schedule "0 18 * * *"
+
   # Shared runner container configuration applied to each job.
   - &runner_config
     working_directory: &working_directory ~/project
@@ -482,9 +476,6 @@ jobs:
 workflows:
   # Commit workflow. Runs for every commit push to the remote repository.
   commit:
-    when:
-      not:
-        equal: [scheduled_pipeline, << pipeline.trigger_source >>]
     jobs:
       - database:
           filters:
@@ -527,11 +518,13 @@ workflows:
               only: /^[0-9]+(\.[0-9]+){2}(-rc\.[0-9]+)?$|^[0-9]{4}-[0-9]{2}-[0-9]{2}(\.[0-9]+)?$/
 
   # Nightly database workflow runs overnight to capture fresh database and cache it.
-  # Requires a "nightly-db" schedule trigger configured in CircleCI UI.
   nightly-db:
-    when:
-      and:
-        - equal: [scheduled_pipeline, << pipeline.trigger_source >>]
-        - equal: ["nightly-db", << pipeline.schedule.name >>]
+    triggers:
+      - schedule:
+          cron: *nightly_db_schedule
+          filters:
+            branches:
+              only:
+                - develop
     jobs:
       - database-nightly

.vortex/installer/tests/Fixtures/handler_process/ciprovider_circleci/.github/workflows/-build-test-deploy.yml

@@ -34,7 +34,7 @@ class CircleCiConfigTest extends TestCase {
    */
   protected function setUp(): void {
     parent::setUp();
-    $file = file_get_contents(__DIR__ . '/../../.circleci/build-test-deploy.yml');
+    $file = file_get_contents(__DIR__ . '/../../.circleci/config.yml');
     if (!$file) {
       throw new \RuntimeException('Unable to read CircleCI config file.');
     }

.vortex/installer/tests/Fixtures/handler_process/ciprovider_circleci/tests/phpunit/CircleCiConfigTest.php

@@ -7,15 +7,6 @@
 # containers defined in `docker-compose.yml` run on a *remote* Docker server
 # controlled by CircleCI.
 # The "runner" container uses Docker client to control the remote Docker server.
-#
-# Scheduled pipelines:
-# The `nightly-db` workflow requires a schedule trigger configured in CircleCI UI.
-# Go to Project Settings > Triggers > Add Scheduled Trigger:
-#   - Trigger name: nightly-db
-#   - Config source: build-test-deploy.yml
-#   - Branch: develop
-#   - Schedule: Every day at 18:00 UTC (or a custom time)
-# See https://www.vortextemplate.com/docs/continuous-integration/circleci
 version: '2.1'
 
 aliases:
@@ -27,6 +18,9 @@ aliases:
   # Replace this key fingerprint with your own and remove this comment.
   - &deploy_ssh_fingerprint "SHA256:6d+U5QubT0eAWz+4N2wt+WM2qx6o4cvyvQ6xILETJ84"
 
+  # Schedule to run nightly database build (to cache the database for the next day).
+  - &nightly_db_schedule "0 18 * * *"
+
   # Shared runner container configuration applied to each job.
   - &runner_config
     working_directory: &working_directory ~/project
@@ -482,9 +476,6 @@ jobs:
 workflows:
   # Commit workflow. Runs for every commit push to the remote repository.
   commit:
-    when:
-      not:
-        equal: [scheduled_pipeline, << pipeline.trigger_source >>]
     jobs:
       - database:
           filters:
@@ -527,11 +518,13 @@ workflows:
               only: /^[0-9]+(\.[0-9]+){2}(-rc\.[0-9]+)?$|^[0-9]{4}-[0-9]{2}-[0-9]{2}(\.[0-9]+)?$/
 
   # Nightly database workflow runs overnight to capture fresh database and cache it.
-  # Requires a "nightly-db" schedule trigger configured in CircleCI UI.
   nightly-db:
-    when:
-      and:
-        - equal: [scheduled_pipeline, << pipeline.trigger_source >>]
-        - equal: ["nightly-db", << pipeline.schedule.name >>]
+    triggers:
+      - schedule:
+          cron: *nightly_db_schedule
+          filters:
+            branches:
+              only:
+                - develop
     jobs:
       - database-nightly