Merge pull request #357 from krousenick/fix-custom-builds-dir

Fix when using the flag --custom_builds_dir-enabled
riemers · Dec 5, 2024 · e15ea85 · e15ea85
2 parents 9b2d82d + baa52e9
commit e15ea85
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -13,7 +13,10 @@ gitlab_runner_wanted_tag: "{{ 'latest' if gitlab_runner_wanted_version == 'lates
 
 # Override the install directory under Windows via host variables etc. (Default: c:/gitlab-runner)
 gitlab_runner_custom_install_directory: ""
-gitlab_runner_install_directory: "{{ gitlab_runner_default_install_directory if (gitlab_runner_custom_install_directory == '') else gitlab_runner_custom_install_directory }}"
+gitlab_runner_install_directory: >-
+  {{ gitlab_runner_default_install_directory
+  if (gitlab_runner_custom_install_directory == '')
+  else gitlab_runner_custom_install_directory }}
 
 # Overridden based on platform
 gitlab_runner_config_file: "{{ __gitlab_runner_config_file_system_mode if gitlab_runner_system_mode else __gitlab_runner_config_file_user_mode }}"

diff --git a/tasks/register-runner.yml b/tasks/register-runner.yml
@@ -138,7 +138,7 @@
       --builds-dir '{{ gitlab_runner.builds_dir }}'
       {% endif %}
       {% if gitlab_runner.custom_build_dir_enabled | default(false) %}
-      --custom_build_dir-enabled '{{ gitlab_runner.custom_build_dir_enabled }}'
+      --custom_build_dir-enabled
       {% endif %}
       {% if gitlab_runner.cache_dir | default(false) %}
       --cache-dir '{{ gitlab_runner.cache_dir }}'

diff --git a/vars/Darwin.yml b/vars/Darwin.yml
@@ -12,4 +12,4 @@ gitlab_runner_directory: /usr/local/bin
 gitlab_runner_executable: "{{ gitlab_runner_directory }}/{{ gitlab_runner_package_name }}"
 
 # working directory for gitlab runner. defaults to current directory
-gitlab_runner_working_directory: ""
+gitlab_runner_working_directory: ""