From 41eeb7badd582175b371cd4a5b2192decbcb0210 Mon Sep 17 00:00:00 2001 From: Jon Date: Sun, 25 Feb 2024 18:58:44 +0930 Subject: [PATCH] fix(ansible_collection): custom release actions to be shell script use a shell script for the custom commands to prevent the var from expansion/parsing !80 nofusscomputing/projects/ansible/collections/phpipam_scan_agent#14 nofusscomputing/projects/ansible/collections/phpipam_scan_agent!13 --- ansible/collection/.gitlab-ci.yml | 34 +++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/ansible/collection/.gitlab-ci.yml b/ansible/collection/.gitlab-ci.yml index d726ff3..510792f 100644 --- a/ansible/collection/.gitlab-ci.yml +++ b/ansible/collection/.gitlab-ci.yml @@ -241,14 +241,40 @@ variables: fi; - | # Custom commands from RELEASE_ADDITIONAL_ACTIONS_BUMP + if [ -f ${RELEASE_ADDITIONAL_ACTIONS_BUMP} ]; then - if [ ${RELEASE_ADDITIONAL_ACTIONS_BUMP} ]; then + echo "Custom commands found in variable RELEASE_ADDITIONAL_ACTIONS_BUMP"; - echo "Custom commands found in variable RELEASE_ADDITIONAL_ACTIONS_BUMP"; + chmod +x ${RELEASE_ADDITIONAL_ACTIONS_BUMP}; - ${RELEASE_ADDITIONAL_ACTIONS_BUMP} + echo '------------------------------ TRACE SoF ------------------------------'; - fi; + echo "File: RELEASE_ADDITIONAL_ACTIONS_BUMP[${RELEASE_ADDITIONAL_ACTIONS_BUMP}]"; + + echo '------ contents ------'; + + echo ""; + + cat ${RELEASE_ADDITIONAL_ACTIONS_BUMP}; + + echo ""; + + echo '------ contents ------'; + + echo ""; + + ${RELEASE_ADDITIONAL_ACTIONS_BUMP}; + + echo ""; + + echo "git reset edited file: ${RELEASE_ADDITIONAL_ACTIONS_BUMP}"; + + git restore ${RELEASE_ADDITIONAL_ACTIONS_BUMP}; + + git status + + echo '------------------------------ TRACE EoF ------------------------------' + fi; # - | # Find merge request ID # echo "Trace CI_OPEN_MERGE_REQUESTS[${CI_OPEN_MERGE_REQUESTS}]";