Skip to content

Commit

Permalink
Merge pull request #16 from JuliaCI/sf/reresolve
Browse files Browse the repository at this point in the history
Allow disabling `allow_reresolve` in `Pkg.test()`.
  • Loading branch information
staticfloat authored Sep 28, 2023
2 parents 83f0ba9 + e75194f commit 6ae61fa
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
3 changes: 2 additions & 1 deletion hooks/command
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ if [[ "${run_tests}" == "true" ]]; then
Pkg.test(${PKG}; coverage=$coverage,
julia_args=\`$julia_args\`,
test_args=\`$test_args\`)
test_args=\`$test_args\`,
${ALLOW_RERESOLVE_LINE})
"
fi

Expand Down
5 changes: 5 additions & 0 deletions hooks/common
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ if [[ -n "${BUILDKITE_PLUGIN_JULIA_TEST_EXTRA_REGISTRIES:-}" ]]; then
ADD_REGISTRIES_BLOCK+='])'
fi

ALLOW_RERESOLVE_LINE=""
if [[ "${BUILDKITE_PLUGIN_JULIA_TEST_ALLOW_RERESOLVE:-true}" != "true" ]]; then
ALLOW_RERESOLVE_LINE="allow_reresolve=${BUILDKITE_PLUGIN_JULIA_TEST_ALLOW_RERESOLVE},"
fi

bugreport_args=""
if [[ "${upload_rr_trace}" != "never" ]]; then
bugreport_args="--bug-report=rr-local --"
Expand Down
3 changes: 3 additions & 0 deletions plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,8 @@ configuration:
# Extra test args (passes `test_args` to `Pkg.test()`), defaults to `""`
test_args:
type: string
# Whether to allow Pkg to automatically re-resolve manifests if used with an incompatible Julia version, defaults to `true`
allow_reresolve:
type: boolean

additionalProperties: false

0 comments on commit 6ae61fa

Please sign in to comment.