Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DAOS-16898 cq: support user bash in githooks #15648

Open
wants to merge 7 commits into
base: master
Choose a base branch
from

Conversation

daltonbohning
Copy link
Contributor

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:

  • Two review approvals and any prior change requests have been resolved.
  • Testing is complete and all tests passed or there is a reason documented in the PR why it should be force landed and forced-landing tag is set.
  • Features: (or Test-tag*) commit pragma was used or there is a reason documented that there are no appropriate tags for this PR.
  • Commit messages follows the guidelines outlined here.
  • Any tests skipped by the ticket being addressed have been run and passed in the PR.

Gatekeeper:

  • You are the appropriate gatekeeper to be landing the patch.
  • The PR has 2 reviews by people familiar with the code, including appropriate owners.
  • Githooks were used. If not, request that user install them and check copyright dates.
  • Checkpatch issues are resolved. Pay particular attention to ones that will show up on future PRs.
  • All builds have passed. Check non-required builds for any new compiler warnings.
  • Sufficient testing is done. Check feature pragmas and test tags and that tests skipped for the ticket are run and now pass with the changes.
  • If applicable, the PR has addressed any potential version compatibility issues.
  • Check the target branch. If it is master branch, should the PR go to a feature branch? If it is a release branch, does it have merge approval in the JIRA ticket.
  • Extra checks if forced landing is requested
    • Review comments are sufficiently resolved, particularly by prior reviewers that requested changes.
    • No new NLT or valgrind warnings. Check the classic view.
    • Quick-build or Quick-functional is not used.
  • Fix the commit message upon landing. Check the standard here. Edit it to create a single commit. If necessary, ask submitter for a new summary.

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]>
@daltonbohning daltonbohning self-assigned this Dec 19, 2024
Copy link

Ticket title is 'githooks: support user bash'
Status is 'In Progress'
https://daosio.atlassian.net/browse/DAOS-16898

rpadma2
rpadma2 previously approved these changes Dec 19, 2024
Copy link
Contributor

@rpadma2 rpadma2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Tested on MacOS and the changes work,

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]>
@daltonbohning daltonbohning requested a review from liw January 8, 2025 16:00
@daltonbohning daltonbohning marked this pull request as ready for review January 8, 2025 17:29
@daltonbohning daltonbohning requested a review from a team as a code owner January 8, 2025 17:29
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]>
@@ -31,6 +32,7 @@ export -f _git_diff_cached_files
hook=${0##*/}
rm -f ".${hook}"

skip_list=()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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}"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This works for me.

Skip-test: true
Skip-tests: true
Skip-unit-tests: true
Skip-nlt: true

Signed-off-by: Dalton Bohning <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants