From 686e70edae36e8e981526b79859dd6e1af265b25 Mon Sep 17 00:00:00 2001
From: Alex Skrypnyk <alex@drevops.com>
Date: Fri, 6 Sep 2024 06:49:27 +1000
Subject: [PATCH 1/2] Updated CI runner to version 24.9.0.

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3c84c34ba..b2558f369 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -57,7 +57,7 @@ aliases:
       # This container has all the necessary tools to run a dockerized environment.
       # @see https://github.com/drevops/ci-runner
       # @see https://hub.docker.com/repository/docker/drevops/ci-runner/tags
-      - image: drevops/ci-runner:24.8.0
+      - image: drevops/ci-runner:24.9.0
         auth:
           username: ${VORTEX_CONTAINER_REGISTRY_USER}
           password: ${VORTEX_CONTAINER_REGISTRY_PASS}

From 61fd888c54c8a8ce040bf539c4c4841d9d3fb3f0 Mon Sep 17 00:00:00 2001
From: Alex Skrypnyk <alex@drevops.com>
Date: Fri, 6 Sep 2024 06:49:45 +1000
Subject: [PATCH 2/2] Simplified local ahoy imports.

---
 .ahoy.yml                                  | 10 +++-------
 .vortex/tests/bats/workflow.utilities.bats |  8 +-------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/.ahoy.yml b/.ahoy.yml
index f46b9befa..3b4bbc7d6 100644
--- a/.ahoy.yml
+++ b/.ahoy.yml
@@ -262,13 +262,9 @@ commands:
 
   local:
     usage: Custom local commands. See `ahoy local help`.
-    cmd: |
-      if [ -f .ahoy.local.yml ]; then
-        ahoy -f ".ahoy.local.yml" "$@"
-      else
-        echo ".ahoy.local.yml does not exist."
-        echo "Copy .ahoy.local.example.yml to .ahoy.local.yml and rerun this command.";
-      fi
+    optional: true
+    imports:
+      - .ahoy.local.yml
 
   # ----------------------------------------------------------------------------
   # Utilities.
diff --git a/.vortex/tests/bats/workflow.utilities.bats b/.vortex/tests/bats/workflow.utilities.bats
index ed929e012..f22b17be9 100644
--- a/.vortex/tests/bats/workflow.utilities.bats
+++ b/.vortex/tests/bats/workflow.utilities.bats
@@ -14,11 +14,9 @@ load _helper.workflow.bash
   step "Run ahoy local commands"
 
   substep "Assert calling local commands without local file does not throw error"
-  run ahoy local
+  run ahoy --version
   assert_success
   assert_output_not_contains "[fatal]"
-  assert_output_contains ".ahoy.local.yml does not exist."
-  assert_output_contains "Copy .ahoy.local.example.yml to .ahoy.local.yml and rerun this command."
 
   substep "Assert calling local commands with local file path specified and file is present works correctly"
   cp ".ahoy.local.example.yml" ".ahoy.local.yml"
@@ -26,8 +24,6 @@ load _helper.workflow.bash
   assert_success
   assert_output_contains "Custom local commands"
   assert_output_not_contains "[fatal]"
-  assert_output_not_contains ".ahoy.local.yml does not exist."
-  assert_output_not_contains "Copy .ahoy.local.example.yml to .ahoy.local.yml and rerun this command."
 
   substep "Assert calling local commands with local file path specified and file is present and file return non-zero exit code"
 
@@ -41,8 +37,6 @@ load _helper.workflow.bash
   assert_failure
   assert_output_contains "expected failure"
   assert_output_not_contains "[fatal]"
-  assert_output_not_contains ".ahoy.local.yml does not exist."
-  assert_output_not_contains "Copy .ahoy.local.example.yml to .ahoy.local.yml and rerun this command."
 }
 
 @test "Doctor info" {