DAOS-16898 cq: support user bash in githooks #15648
Merged
+52
−23
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Replace hardcoded /bin/bash with /usr/bin/env bash in the githook scripts, for the case where /bin/bash does not support newer features like, e.g., mapfile. Skip-test: true Skip-tests: true SKip-unit-tests: true Skip-nlt: true Required-githooks: true Signed-off-by: Dalton Bohning <[email protected]>
|
Ticket title is 'githooks: support user bash' |
rpadma2
previously approved these changes
Dec 19, 2024
Skip-test: true Skip-tests: true Skip-unit-tests: true Skip-nlt: true Required-githooks: true Signed-off-by: Dalton Bohning <[email protected]>
Skip-test: true Skip-tests: true Skip-unit-tests: true Skip-nlt: true Required-githooks: true Signed-off-by: Dalton Bohning <[email protected]>
Skip-test: true Skip-tests: true Skip-unit-tests: true Skip-nlt: true Signed-off-by: Dalton Bohning <[email protected]>
Skip-test: true Skip-tests: true Skip-unit-tests: true Skip-nlt: true Signed-off-by: Dalton Bohning <[email protected]>
liw
reviewed
Jan 10, 2025
utils/githooks/hook_base.sh
Outdated
| @@ -31,6 +32,7 @@ export -f _git_diff_cached_files | |||
| hook=${0##*/} | |||
| rm -f ".${hook}" | |||
|
|
|||
| skip_list=() | |||
There was a problem hiding this comment.
Unfortunately, this does not fix the problem in my testing: With or without this line, I get the same "unbound variable" error. Some reading shows that the read -a v builtin command unsets v at the beginning. If we really want to keep set -u, then the following works for me:
@@ -41,7 +41,7 @@ run-parts() {
# don't run vim .swp files
[ "${i%.sw?}" != "${i}" ] && continue
skip_item=false
- for skip in "${skip_list[@]}"; do
+ for skip in "${skip_list[@]:-}"; do
if [[ "${i}" =~ ${skip} ]]; then
skip_item=true
echo "Skipping ${i}"
There was a problem hiding this comment.
Thanks. Pushed :)
| while IFS= read -r base; do | ||
| all_bases+=("$base") | ||
| done < <(echo "master" | ||
| git branch -r | sed -ne "/^ $origin\\/release\\/\(2.[4-9]\|[3-9]\)/s/^ $origin\\///p") |
Skip-test: true Skip-tests: true Skip-unit-tests: true Skip-nlt: true Signed-off-by: Dalton Bohning <[email protected]>
phender
reviewed
Jan 21, 2025
rpadma2
previously approved these changes
Jan 21, 2025
rpadma2
reviewed
Jan 21, 2025
| @@ -1,6 +1,7 @@ | |||
| #!/bin/bash | |||
| #!/usr/bin/env bash | |||
| # | |||
| # Copyright 2023-2024 Intel Corporation. | |||
There was a problem hiding this comment.
Is there any specific reason why Intel copyright years differ on each file? It maybe related to the file creation date... Still seems little confusing... some files have 2024 alone, 2022-2024, 2023-2024, etc... Anyway, it's minor issue.,
There was a problem hiding this comment.
That is intended. Copyright on a file begins when it is created
Skip-test: true Skip-tests: true SKip-unit-tests: true Skip-nlt: true Signed-off-by: Dalton Bohning <[email protected]>
Skip-test: true Skip-tests: true SKip-unit-tests: true Skip-nlt: true Signed-off-by: Dalton Bohning <[email protected]>
rpadma2
previously approved these changes
Jan 22, 2025
Skip-test: true Skip-tests: true SKip-unit-tests: true Skip-nlt: true Signed-off-by: Dalton Bohning <[email protected]>
Skip-test: true Skip-tests: true SKip-unit-tests: true Skip-nlt: true Signed-off-by: Dalton Bohning <[email protected]>
rpadma2
approved these changes
Jan 23, 2025
phender
approved these changes
Jan 24, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Replace hardcoded /bin/bash with /usr/bin/env bash in the githook scripts, for the case where /bin/bash does not support newer features like, e.g., mapfile.
Skip-test: true
Skip-tests: true
SKip-unit-tests: true
Skip-nlt: true
Required-githooks: true
Before requesting gatekeeper:
Features:(orTest-tag*) commit pragma was used or there is a reason documented that there are no appropriate tags for this PR.Gatekeeper: