Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into dbohning/daos-12950
Browse files Browse the repository at this point in the history
Skip-func-hw-test: true
Skip-unit-tests: true
Skip-fault-injection-test: true

Required-githooks: true

Signed-off-by: Dalton Bohning <[email protected]>
  • Loading branch information
daltonbohning committed Jan 19, 2024
2 parents 188afe6 + be4402b commit 102c4f1
Show file tree
Hide file tree
Showing 551 changed files with 35,325 additions and 13,979 deletions.
3 changes: 3 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,6 @@ AlignConsecutiveBitFields: AcrossEmptyLinesAndComments
SpaceBeforeParens: ControlStatementsExceptForEachMacros
KeepEmptyLinesAtTheStartOfBlocks: false
MaxEmptyLinesToKeep: 1
---
Language: Json
IndentWidth: 2
30 changes: 30 additions & 0 deletions .github/workflows/bash_unit_testing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: bash Unit Testing

on:
push:
pull_request:

concurrency:
group: bash-unit-test-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

defaults:
run:
shell: bash --noprofile --norc -ueo pipefail {0}

jobs:
Test-gha-functions:
name: Tests in ci/gha_functions.sh
runs-on: [self-hosted, light]
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Checkout bash_unit project
uses: actions/checkout@v4
with:
repository: 'pgrange/bash_unit'
path: bash_unit
- name: Unit testing with bash_unit
run: FORCE_COLOR=true ./bash_unit/bash_unit ci/gha_functions.sh
18 changes: 18 additions & 0 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,24 @@ jobs:
- name: Run on build files.
run: find . -name SConscript | xargs isort --check-only

shell-check:
name: ShellCheck
runs-on: ubuntu-22.04
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Run
run: sudo apt-get update && sudo apt-get install shellcheck
- name: Add error parser
run: echo -n "::add-matcher::ci/shellcheck-matcher.json"
- name: Run Shellcheck
# The check will run with this file from the target branch but the code from the PR so
# test for this file before calling it to prevent failures on PRs where this check is
# in the target branch but the PR is not updated to include it.
run: \[ ! -x ci/run_shellcheck.sh \] || ./ci/run_shellcheck.sh

log-check:
name: Logging macro checking
runs-on: ubuntu-22.04
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/pylint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,16 @@ jobs:
uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}
- uses: actions/setup-python@v5
with:
python-version: '3.11'
- name: Install core python packages
run: python3 -m pip install --requirement requirements.txt
- name: Install extra python packages
run: python3 -m pip install --requirement utils/cq/requirements.txt
- name: Install enchant
run: sudo apt-get update && sudo apt-get -y install python3-enchant
- name: Show versions
run: ./utils/cq/daos_pylint.py --version
- name: Run pylint check.
run: ./utils/cq/daos_pylint.py --git --output-format github
7 changes: 5 additions & 2 deletions .github/workflows/rpm-build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ env:
# build is done on the lowest version and test on the highest with a "sanity test"
# stage done on all versions in the list ecept the highest
EL8_BUILD_VERSION: 8.6
EL8_VERSION: 8
EL8_VERSION: 8.8
EL9_BUILD_VERSION: 9
EL9_VERSION: 9
LEAP15_VERSION: 15.4
LEAP15_VERSION: 15.5

on:
workflow_dispatch:
Expand Down Expand Up @@ -60,6 +60,9 @@ jobs:
echo "text<<EOF" >> $GITHUB_OUTPUT;
git show -s --format=%B | escape_single_quotes >> $GITHUB_OUTPUT;
echo "EOF" >> $GITHUB_OUTPUT;
- name: Identify Commit Pragmas
run: . ci/gha_functions.sh;
echo '${{steps.dequoted_commit_message.outputs.text }}' | get_commit_pragmas

Import-commit-pragmas:
name: Make commit pragma variables
Expand Down
Loading

0 comments on commit 102c4f1

Please sign in to comment.