diff --git a/.github/actions/add-codeowners/codeowners.sh b/.github/actions/add-codeowners/codeowners.sh index bdcc9077c6..7bc04766b3 100755 --- a/.github/actions/add-codeowners/codeowners.sh +++ b/.github/actions/add-codeowners/codeowners.sh @@ -1,14 +1,25 @@ #!/bin/bash +RESULT_PATH="${1:-.}" +if [ ! -d "$RESULT_PATH" ]; then + echo "Error: Result path does not exist" + exit 1 +fi + +cd "$RESULT_PATH" || exit 1 + for file in gotestsum-report*.xml; do - temp_file="tempfile.xml" + # Skip if the glob didn't match any files + [ -f "$file" ] || break + + temp_file="${file}_tmp.xml" # force write a new line at the end of the gotestsum-report.xml, or else # the loop will skip the last line. # fixes issue with a missing - echo -e "\n" >> $file + echo -e "\n" >> "$file" - while read p; do + while IFS= read -r p || [ -n "$p" ]; do # we might try to report gotestsum-report.xml multiple times, so don't # calculate codeowners more times than we need if [[ "$p" =~ \> "$temp_file" fi - done < $file + done < "$file" - mv "$temp_file" $file + mv "$temp_file" "$file" done \ No newline at end of file diff --git a/.github/actions/dd-ci-upload/action.yml b/.github/actions/dd-ci-upload/action.yml index 372e38bd93..958236675b 100644 --- a/.github/actions/dd-ci-upload/action.yml +++ b/.github/actions/dd-ci-upload/action.yml @@ -44,7 +44,7 @@ runs: - name: Add CodeOwners to JUnit files shell: bash - run: ./.github/actions/add-codeowners/codeowners.sh + run: ./.github/actions/add-codeowners/codeowners.sh "${{ inputs.path }}" - name: Upload the JUnit files shell: bash diff --git a/internal/orchestrion/_integration/go.sum b/internal/orchestrion/_integration/go.sum index efc30c2e90..92c8d938fc 100644 --- a/internal/orchestrion/_integration/go.sum +++ b/internal/orchestrion/_integration/go.sum @@ -987,8 +987,8 @@ github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARu github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= github.com/containerd/containerd v1.7.27 h1:yFyEyojddO3MIGVER2xJLWoCIn+Up4GaHFquP7hsFII= github.com/containerd/containerd v1.7.27/go.mod h1:xZmPnl75Vc+BLGt4MIfu6bp+fy03gdHAn9bz+FreFR0= -github.com/containerd/containerd/api v1.9.0 h1:HZ/licowTRazus+wt9fM6r/9BQO7S0vD5lMcWspGIg0= -github.com/containerd/containerd/api v1.9.0/go.mod h1:GhghKFmTR3hNtyznBoQ0EMWr9ju5AqHjcZPsSpTKutI= +github.com/containerd/containerd/api v1.10.0 h1:5n0oHYVBwN4VhoX9fFykCV9dF1/BvAXeg2F8W6UYq1o= +github.com/containerd/containerd/api v1.10.0/go.mod h1:NBm1OAk8ZL+LG8R0ceObGxT5hbUYj7CzTmR3xh0DlMM= github.com/containerd/continuity v0.4.4 h1:/fNVfTJ7wIl/YPMHjf+5H32uFhl63JucB34PlCpMKII= github.com/containerd/continuity v0.4.4/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE= github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI= diff --git a/orchestrion/all/go.mod b/orchestrion/all/go.mod index aa2ff3e5af..4bfcba71b3 100644 --- a/orchestrion/all/go.mod +++ b/orchestrion/all/go.mod @@ -115,7 +115,7 @@ require ( github.com/cloudwego/iasm v0.2.0 // indirect github.com/confluentinc/confluent-kafka-go v1.9.2 // indirect github.com/confluentinc/confluent-kafka-go/v2 v2.4.0 // indirect - github.com/containerd/containerd/api v1.9.0 // indirect + github.com/containerd/containerd/api v1.10.0 // indirect github.com/containerd/errdefs v1.0.0 // indirect github.com/containerd/platforms v0.2.1 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect diff --git a/orchestrion/all/go.sum b/orchestrion/all/go.sum index 9b76c30973..db58fcb14f 100644 --- a/orchestrion/all/go.sum +++ b/orchestrion/all/go.sum @@ -985,8 +985,8 @@ github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARu github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= github.com/containerd/containerd v1.7.27 h1:yFyEyojddO3MIGVER2xJLWoCIn+Up4GaHFquP7hsFII= github.com/containerd/containerd v1.7.27/go.mod h1:xZmPnl75Vc+BLGt4MIfu6bp+fy03gdHAn9bz+FreFR0= -github.com/containerd/containerd/api v1.9.0 h1:HZ/licowTRazus+wt9fM6r/9BQO7S0vD5lMcWspGIg0= -github.com/containerd/containerd/api v1.9.0/go.mod h1:GhghKFmTR3hNtyznBoQ0EMWr9ju5AqHjcZPsSpTKutI= +github.com/containerd/containerd/api v1.10.0 h1:5n0oHYVBwN4VhoX9fFykCV9dF1/BvAXeg2F8W6UYq1o= +github.com/containerd/containerd/api v1.10.0/go.mod h1:NBm1OAk8ZL+LG8R0ceObGxT5hbUYj7CzTmR3xh0DlMM= github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM= github.com/containerd/continuity v0.4.2/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ= github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=