Skip to content

Commit 2d21de3

Browse files
committed
Merge branch 'master' into hendersp/DAOS-17203
Skip-func-hw-test: true Skip-func-test-leap15: false Signed-off-by: Phil Henderson <[email protected]>
2 parents 45d37bc + c4a6f47 commit 2d21de3

File tree

421 files changed

+15240
-7663
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

421 files changed

+15240
-7663
lines changed

.clang-format-ignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
deps/**

.dockerignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
# just generate noise and extra work for docker.
66
*
77
!src
8+
!deps
89
!utils/build.config
910
!utils/certs
1011
!utils/ci
@@ -15,6 +16,7 @@
1516
!utils/setup_daos_server_helper.sh
1617
!utils/sl/setup_local.sh
1718
!utils/scripts
19+
!utils/systemd
1820
!utils/rpms
1921
!utils/run_utest.py
2022
!utils/utest.yaml

.github/dependabot.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ updates:
2424
- "*"
2525
assignees:
2626
- daos-stack/actions-watchers
27+
commit-message:
28+
prefix: "Doc-only: true \n"
2729

2830
- package-ecosystem: github-actions
2931
target-branch: release/2.6

.github/workflows/bash_unit_testing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
pull_request:
55

66
concurrency:
7-
group: bash-unit-test-${{ github.head_ref || github.run_id }}
7+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
88
cancel-in-progress: true
99

1010
defaults:

.github/workflows/bullseye-coverage.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ on:
4747

4848

4949
concurrency:
50-
group: bullseye-coverage-${{ github.head_ref || github.run_id }}
50+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
5151
cancel-in-progress: true
5252

5353
defaults:
@@ -237,7 +237,7 @@ jobs:
237237
- name: Checkout code
238238
uses: actions/checkout@v4
239239
with:
240-
submodules: true
240+
submodules: 'recursive'
241241
fetch-depth: 500
242242
ref: ${{ github.event.pull_request.head.sha }}
243243
- name: Import commit pragmas
@@ -366,7 +366,7 @@ jobs:
366366
if: (!cancelled()) && (success() || failure()) &&
367367
steps.run-test.outcome != 'skipped'
368368
# yamllint disable-line rule:line-length
369-
uses: EnricoMi/publish-unit-test-result-action@170bf24d20d201b842d7a52403b73ed297e6645b # v2.18.0
369+
uses: EnricoMi/publish-unit-test-result-action@3a74b2957438d0b6e2e61d67b05318aa25c9e6c6 # v2.20.0
370370
with:
371371
check_name: ${{ env.STAGE_NAME }} Test Results
372372
github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -521,7 +521,7 @@ jobs:
521521
- name: Checkout code
522522
uses: actions/checkout@v4
523523
with:
524-
submodules: true
524+
submodules: 'recursive'
525525
fetch-depth: 500
526526
ref: ${{ github.event.pull_request.head.sha }}
527527
- name: Import commit pragmas
@@ -634,7 +634,7 @@ jobs:
634634
if: (!cancelled()) && (success() || failure()) &&
635635
steps.run-test.outcome != 'skipped'
636636
# yamllint disable-line rule:line-length
637-
uses: EnricoMi/publish-unit-test-result-action@170bf24d20d201b842d7a52403b73ed297e6645b # v2.18.0
637+
uses: EnricoMi/publish-unit-test-result-action@3a74b2957438d0b6e2e61d67b05318aa25c9e6c6 # v2.20.0
638638
with:
639639
check_name: ${{ env.STAGE_NAME }} Test Results
640640
github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci2.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
pull_request:
55

66
concurrency:
7-
group: ci2-${{ github.head_ref }}
7+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
88
cancel-in-progress: true
99

1010
permissions: {}
@@ -36,7 +36,7 @@ jobs:
3636
- name: Checkout code
3737
uses: actions/checkout@v4
3838
with:
39-
submodules: true
39+
submodules: 'recursive'
4040
fetch-depth: 500
4141
ref: ${{ github.event.pull_request.head.sha }}
4242
- name: Setup git hash
@@ -68,7 +68,7 @@ jobs:
6868
- name: Publish NLT test results
6969
if: always()
7070
# yamllint disable-line rule:line-length
71-
uses: EnricoMi/publish-unit-test-result-action@170bf24d20d201b842d7a52403b73ed297e6645b # v2.18.0
71+
uses: EnricoMi/publish-unit-test-result-action@3a74b2957438d0b6e2e61d67b05318aa25c9e6c6 # v2.20.0
7272
with:
7373
github_token: ${{ secrets.GITHUB_TOKEN }}
7474
files: nlt-junit.xml
@@ -102,7 +102,7 @@ jobs:
102102
- name: Checkout code
103103
uses: actions/checkout@v4
104104
with:
105-
submodules: true
105+
submodules: 'recursive'
106106
fetch-depth: 500
107107
ref: ${{ github.event.pull_request.head.sha }}
108108
- name: Setup git hash

.github/workflows/landing-builds.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ on:
1818
- requirements-utest.txt
1919
- utils/build.config
2020

21+
concurrency:
22+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
23+
cancel-in-progress: true
24+
2125
permissions: {}
2226

2327
jobs:
@@ -62,6 +66,7 @@ jobs:
6266
- name: Checkout code
6367
uses: actions/checkout@v4
6468
with:
69+
submodules: 'recursive'
6570
fetch-depth: 500
6671
- name: Setup git hash
6772
run: ./ci/gha_helper.py --single
@@ -109,7 +114,7 @@ jobs:
109114
- name: Checkout code
110115
uses: actions/checkout@v4
111116
with:
112-
submodules: true
117+
submodules: 'recursive'
113118
fetch-depth: 500
114119
- name: Setup git hash
115120
run: ./ci/gha_helper.py --single
@@ -139,7 +144,7 @@ jobs:
139144
- name: Publish NLT test results
140145
if: always()
141146
# yamllint disable-line rule:line-length
142-
uses: EnricoMi/publish-unit-test-result-action@170bf24d20d201b842d7a52403b73ed297e6645b # v2.18.0
147+
uses: EnricoMi/publish-unit-test-result-action@3a74b2957438d0b6e2e61d67b05318aa25c9e6c6 # v2.20.0
143148
with:
144149
github_token: ${{ secrets.GITHUB_TOKEN }}
145150
files: nlt-junit.xml
@@ -178,7 +183,7 @@ jobs:
178183
- name: Checkout code
179184
uses: actions/checkout@v4
180185
with:
181-
submodules: true
186+
submodules: 'recursive'
182187
fetch-depth: 500
183188
- name: Setup git hash
184189
run: ./ci/gha_helper.py --single
@@ -252,7 +257,8 @@ jobs:
252257
- name: Checkout code
253258
uses: actions/checkout@v4
254259
with:
255-
submodules: true
260+
submodules: 'recursive'
261+
fetch-depth: 500
256262
- name: Build dependencies in image.
257263
run: docker build . --file utils/docker/Dockerfile.${{ matrix.base }}
258264
--build-arg DEPS_JOBS
@@ -340,7 +346,8 @@ jobs:
340346
- name: Checkout code
341347
uses: actions/checkout@v4
342348
with:
343-
submodules: true
349+
submodules: 'recursive'
350+
fetch-depth: 500
344351
- name: Build dependencies in image.
345352
run: docker build . --file utils/docker/Dockerfile.${{ matrix.base }}
346353
--build-arg DEPS_JOBS

.github/workflows/linting.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ on:
99
- 'release/*'
1010
pull_request:
1111

12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
14+
cancel-in-progress: true
15+
1216
permissions: {}
1317

1418
jobs:
@@ -25,7 +29,7 @@ jobs:
2529
with:
2630
ref: ${{ github.event.pull_request.head.sha }}
2731
- name: Set up Python environment
28-
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
32+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
2933
with:
3034
python-version: '3'
3135
- name: Install extra python packages
@@ -86,7 +90,7 @@ jobs:
8690
with:
8791
ref: ${{ github.event.pull_request.head.sha }}
8892
- name: Set up Python environment
89-
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
93+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
9094
with:
9195
python-version: '3'
9296
- name: Add parser
@@ -139,7 +143,7 @@ jobs:
139143
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
140144
with:
141145
ref: ${{ github.event.pull_request.head.sha }}
142-
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
146+
- uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
143147
with:
144148
python-version: '3.11'
145149
- name: Install python packages
@@ -194,7 +198,7 @@ jobs:
194198
with:
195199
ref: ${{ github.event.pull_request.head.sha }}
196200
- name: Set up Python environment
197-
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
201+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
198202
with:
199203
python-version: '3'
200204
- name: Install extra python packages

.github/workflows/ossf-scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
persist-credentials: false
3939

4040
- name: "Run analysis"
41-
uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
41+
uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
4242
with:
4343
results_file: results.sarif
4444
results_format: sarif
@@ -71,6 +71,6 @@ jobs:
7171
# Upload the results to GitHub's code scanning dashboard (optional).
7272
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
7373
- name: "Upload to code-scanning"
74-
uses: github/codeql-action/upload-sarif@5f8171a638ada777af81d42b55959a643bb29017 # v3.28.12
74+
uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
7575
with:
7676
sarif_file: results.sarif

.github/workflows/rpm-build-and-test-report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
esac
9494
echo "STAGE_NAME=Build RPM on $DISTRO_NAME $DISTRO_VERSION" >> $GITHUB_ENV
9595
- name: Test Report
96-
uses: dorny/test-reporter@6e6a65b7a0bd2c9197df7d0ae36ac5cee784230c # v2.0.0
96+
uses: dorny/test-reporter@890a17cecf52a379fc869ab770a71657660be727 # v2.1.0
9797
with:
9898
artifact: ${{ env.STAGE_NAME }} test-results
9999
name: ${{ env.STAGE_NAME }} Test Results (dorny)
@@ -112,7 +112,7 @@ jobs:
112112
- name: Set variables
113113
run: echo "STAGE_NAME=Functional Hardware ${{ matrix.stage }}" >> $GITHUB_ENV
114114
- name: Test Report
115-
uses: dorny/test-reporter@6e6a65b7a0bd2c9197df7d0ae36ac5cee784230c # v2.0.0
115+
uses: dorny/test-reporter@890a17cecf52a379fc869ab770a71657660be727 # v2.1.0
116116
with:
117117
artifact: ${{ env.STAGE_NAME }} test-results
118118
name: ${{ env.STAGE_NAME }} Test Results (dorny)

0 commit comments

Comments
 (0)