Mergeback from master to resolve conflicts

buildkite-plugins · Mar 25, 2023 · c3e72bd · c3e72bd
2 parents e28b502 + 630b3d6
commit c3e72bd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/buildkite.yaml b/buildkite.yaml
@@ -6,10 +6,10 @@ steps:
 
   - label: ":sparkles:"
     plugins:
-      plugin-linter#v3.0.0:
+      plugin-linter#v3.1.0:
         id: test-collector
 
   - label: ":docker: :hammer:"
     plugins:
-      docker-compose#v4.9.0:
+      docker-compose#v4.11.0:
         run: tests
diff --git a/hooks/pre-exit b/hooks/pre-exit
@@ -92,7 +92,7 @@ find_and_upload() {
   FILES_PATTERN="$1"
   FIND_CMD=(find)
 
-  if [[ "${BUILDKITE_PLUGIN_TEST_COLLECTOR_FOLLOW_LINKS:-}" =~ ^(true|on|1|always)$ ]]; then
+  if [[ "${BUILDKITE_PLUGIN_TEST_COLLECTOR_FOLLOW_SYMLINKS:-}" =~ ^(true|on|1|always)$ ]]; then
     FIND_CMD+=('-L')
   fi
 

diff --git a/tests/pre-exit-success.bats b/tests/pre-exit-success.bats
@@ -161,7 +161,7 @@ COMMON_CURL_OPTIONS='--form \* --form \* --form \* --form \* --form \* --form \*
 }
 
 @test "Follow links option enabled adds find option" {
-  export BUILDKITE_PLUGIN_TEST_COLLECTOR_FOLLOW_LINKS='true'
+  export BUILDKITE_PLUGIN_TEST_COLLECTOR_FOLLOW_SYMLINKS='true'
 
   stub find "-L . -path \* : echo './tests/fixtures/junit-1.xml'"
   stub curl "-X POST --silent --show-error --max-time 30 --form format=junit ${COMMON_CURL_OPTIONS} \* -H \* : echo 'curl success'"
@@ -176,7 +176,7 @@ COMMON_CURL_OPTIONS='--form \* --form \* --form \* --form \* --form \* --form \*
 }
 
 @test "Follow links option disabled does not add find option" {
-  export BUILDKITE_PLUGIN_TEST_COLLECTOR_FOLLOW_LINKS='false'
+  export BUILDKITE_PLUGIN_TEST_COLLECTOR_FOLLOW_SYMLINKS='false'
 
   stub find ". -path \* : echo './tests/fixtures/junit-1.xml'"
   stub curl "-X POST --silent --show-error --max-time 30 --form format=junit ${COMMON_CURL_OPTIONS} \* -H \* : echo 'curl success'"