From 22473fcee70d5a72f884a71365ef49ec9b5429d0 Mon Sep 17 00:00:00 2001 From: Hunter Christain <47791064+exp-hc@users.noreply.github.com> Date: Fri, 19 Nov 2021 16:03:33 -0600 Subject: [PATCH 1/4] replacing mv with rsync and rm --- action.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/action.yml b/action.yml index 7201d56..9f0dbc8 100644 --- a/action.yml +++ b/action.yml @@ -156,16 +156,19 @@ runs: echo ::group::Move "'${{ steps.collection-metadata.outputs.fqcn }}'" collection to ${{ steps.collection-metadata.outputs.checkout-path }}... shell: bash - - name: Install ansible-core (${{ inputs.ansible-core-version }}) + - name: Move collection to test directory run: >- set -x ; mkdir -pv "${{ steps.collection-metadata.outputs.collection-namespace-path }}" ; - mv -v + rsync -a + ".tmp-ansible-collection-checkout/." + "${{ steps.collection-metadata.outputs.checkout-path }}/." + ; + rm -rf ".tmp-ansible-collection-checkout" - "${{ steps.collection-metadata.outputs.checkout-path }}" ; set +x shell: bash From ff1198d927f62b8122ec4cae3d72d7bf51f5b00a Mon Sep 17 00:00:00 2001 From: Hunter Christain <47791064+exp-hc@users.noreply.github.com> Date: Mon, 22 Nov 2021 09:56:18 -0600 Subject: [PATCH 2/4] rm test dir first to prevent dirty working dir --- action.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/action.yml b/action.yml index 9f0dbc8..5ece5a9 100644 --- a/action.yml +++ b/action.yml @@ -160,15 +160,15 @@ runs: run: >- set -x ; + rm -rf + "${{ steps.collection-metadata.outputs.checkout-path }}" + ; mkdir -pv "${{ steps.collection-metadata.outputs.collection-namespace-path }}" ; - rsync -a - ".tmp-ansible-collection-checkout/." - "${{ steps.collection-metadata.outputs.checkout-path }}/." - ; - rm -rf + mv -v ".tmp-ansible-collection-checkout" + "${{ steps.collection-metadata.outputs.checkout-path }}" ; set +x shell: bash From 13242913c74939a29e9606a957656d4f3f344d8d Mon Sep 17 00:00:00 2001 From: Hunter Christain <47791064+exp-hc@users.noreply.github.com> Date: Mon, 22 Nov 2021 14:30:58 -0600 Subject: [PATCH 3/4] removing collection dir and tmp dir at start --- action.yml | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/action.yml b/action.yml index 5ece5a9..e044992 100644 --- a/action.yml +++ b/action.yml @@ -62,6 +62,25 @@ outputs: runs: using: composite steps: + - name: Open an expandable block of code + run: >- + echo ::group::Ensure clean test environment + shell: bash + - name: Ensure clean test environment + run: >- + set -x + ; + rm -rf + ansible_collections + .tmp-ansible-collection-checkout + ; + set +x + shell: bash + - name: Close an expandable block of code + run: >- + echo ::endgroup:: + shell: bash + - name: Open an expandable block of code run: >- echo ::group::Setting controller Python @@ -160,9 +179,6 @@ runs: run: >- set -x ; - rm -rf - "${{ steps.collection-metadata.outputs.checkout-path }}" - ; mkdir -pv "${{ steps.collection-metadata.outputs.collection-namespace-path }}" ; From e905f58ab42f47108034cc3f48b806fbd7e412f9 Mon Sep 17 00:00:00 2001 From: Hunter Christain <47791064+exp-hc@users.noreply.github.com> Date: Mon, 22 Nov 2021 14:30:58 -0600 Subject: [PATCH 4/4] removing collection dir and tmp dir at start --- action.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/action.yml b/action.yml index 7201d56..520d88a 100644 --- a/action.yml +++ b/action.yml @@ -62,6 +62,25 @@ outputs: runs: using: composite steps: + - name: Open an expandable block of code + run: >- + echo ::group::Ensure clean test environment + shell: bash + - name: Ensure clean test environment + run: >- + set -x + ; + rm -rf + ansible_collections + .tmp-ansible-collection-checkout + ; + set +x + shell: bash + - name: Close an expandable block of code + run: >- + echo ::endgroup:: + shell: bash + - name: Open an expandable block of code run: >- echo ::group::Setting controller Python