Skip to content

Commit 2f25cb6

Browse files
yinyiqian1yinyiqian1
authored
Merge branch 'develop' into account_mpts
2 parents 890279b + 8c8a7ff commit 2f25cb6

File tree

13 files changed

+29
-80
lines changed

13 files changed

+29
-80
lines changed

‎.github/actions/build-clio/action.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ inputs:
55
targets:
66
description: Space-separated build target names
77
default: all
8-
subtract_threads:
9-
description: An option for the action get-threads-number.
8+
nproc_subtract:
9+
description: The number of processors to subtract when calculating parallelism.
1010
required: true
1111
default: "0"
1212

1313
runs:
1414
using: composite
1515
steps:
16-
- name: Get number of threads
17-
uses: ./.github/actions/get-threads-number
18-
id: number_of_threads
16+
- name: Get number of processors
17+
uses: XRPLF/actions/.github/actions/get-nproc@046b1620f6bfd6cd0985dc82c3df02786801fe0a
18+
id: nproc
1919
with:
20-
subtract_threads: ${{ inputs.subtract_threads }}
20+
subtract: ${{ inputs.nproc_subtract }}
2121

2222
- name: Build targets
2323
shell: bash
@@ -27,5 +27,5 @@ runs:
2727
cd build
2828
cmake \
2929
--build . \
30-
--parallel "${{ steps.number_of_threads.outputs.threads_number }}" \
30+
--parallel "${{ steps.nproc.outputs.nproc }}" \
3131
--target ${CMAKE_TARGETS}

‎.github/actions/code-coverage/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ runs:
2424
-j8 --exclude-throw-branches
2525
2626
- name: Archive coverage report
27-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
27+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
2828
with:
2929
name: coverage-report.xml
3030
path: build/coverage_report.xml

‎.github/actions/get-threads-number/action.yml‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎.github/dependabot.yml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -91,19 +91,6 @@ updates:
9191
prefix: "ci: [DEPENDABOT] "
9292
target-branch: develop
9393

94-
- package-ecosystem: github-actions
95-
directory: .github/actions/get-threads-number/
96-
schedule:
97-
interval: weekly
98-
day: monday
99-
time: "04:00"
100-
timezone: Etc/GMT
101-
reviewers:
102-
- XRPLF/clio-dev-team
103-
commit-message:
104-
prefix: "ci: [DEPENDABOT] "
105-
target-branch: develop
106-
10794
- package-ecosystem: github-actions
10895
directory: .github/actions/git-common-ancestor/
10996
schedule:

‎.github/workflows/build-clio-docker-image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848

4949
- name: Download Clio binary from artifact
5050
if: ${{ inputs.artifact_name != null }}
51-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
51+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
5252
with:
5353
name: ${{ inputs.artifact_name }}
5454
path: ./docker/clio/artifact/

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
steps:
117117
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
118118

119-
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
119+
- uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
120120
with:
121121
name: clio_server_Linux_Release_gcc
122122

‎.github/workflows/check-libxrpl.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
run: strip build/clio_tests
5858

5959
- name: Upload clio_tests
60-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
60+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
6161
with:
6262
name: clio_tests_check_libxrpl
6363
path: build/clio_tests
@@ -70,7 +70,7 @@ jobs:
7070
image: ghcr.io/xrplf/clio-ci:b2be4b51d1d81548ca48e2f2b8f67356b880c96d
7171

7272
steps:
73-
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
73+
- uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
7474
with:
7575
name: clio_tests_check_libxrpl
7676

‎.github/workflows/clang-tidy.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,16 @@ jobs:
6161
with:
6262
conan_profile: ${{ env.CONAN_PROFILE }}
6363

64-
- name: Get number of threads
65-
uses: ./.github/actions/get-threads-number
66-
id: number_of_threads
64+
- name: Get number of processors
65+
uses: XRPLF/actions/.github/actions/get-nproc@046b1620f6bfd6cd0985dc82c3df02786801fe0a
66+
id: nproc
6767

6868
- name: Run clang-tidy
6969
continue-on-error: true
7070
shell: bash
7171
id: run_clang_tidy
7272
run: |
73-
run-clang-tidy-${{ env.LLVM_TOOLS_VERSION }} -p build -j "${{ steps.number_of_threads.outputs.threads_number }}" -fix -quiet 1>output.txt
73+
run-clang-tidy-${{ env.LLVM_TOOLS_VERSION }} -p build -j "${{ steps.nproc.outputs.nproc }}" -fix -quiet 1>output.txt
7474
7575
- name: Fix local includes and clang-format style
7676
if: ${{ steps.run_clang_tidy.outcome != 'success' }}

‎.github/workflows/pre-commit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
run-hooks:
11-
uses: XRPLF/actions/.github/workflows/pre-commit.yml@a8d7472b450eb53a1e5228f64552e5974457a21a
11+
uses: XRPLF/actions/.github/workflows/pre-commit.yml@34790936fae4c6c751f62ec8c06696f9c1a5753a
1212
with:
1313
runs_on: heavy
1414
container: '{ "image": "ghcr.io/xrplf/clio-pre-commit:b2be4b51d1d81548ca48e2f2b8f67356b880c96d" }'

‎.github/workflows/reusable-build.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ jobs:
145145

146146
- name: Upload build time analyze report
147147
if: ${{ inputs.analyze_build_time }}
148-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
148+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
149149
with:
150150
name: build_time_report_${{ runner.os }}_${{ inputs.build_type }}_${{ inputs.conan_profile }}
151151
path: build_time_report.txt
@@ -170,28 +170,28 @@ jobs:
170170

171171
- name: Upload clio_server
172172
if: ${{ inputs.upload_clio_server && !inputs.code_coverage && !inputs.analyze_build_time }}
173-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
173+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
174174
with:
175175
name: clio_server_${{ runner.os }}_${{ inputs.build_type }}_${{ inputs.conan_profile }}
176176
path: build/clio_server
177177

178178
- name: Upload clio_tests
179179
if: ${{ !inputs.code_coverage && !inputs.analyze_build_time && !inputs.package }}
180-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
180+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
181181
with:
182182
name: clio_tests_${{ runner.os }}_${{ inputs.build_type }}_${{ inputs.conan_profile }}
183183
path: build/clio_tests
184184

185185
- name: Upload clio_integration_tests
186186
if: ${{ !inputs.code_coverage && !inputs.analyze_build_time && !inputs.package }}
187-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
187+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
188188
with:
189189
name: clio_integration_tests_${{ runner.os }}_${{ inputs.build_type }}_${{ inputs.conan_profile }}
190190
path: build/clio_integration_tests
191191

192192
- name: Upload Clio Linux package
193193
if: ${{ inputs.package }}
194-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
194+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
195195
with:
196196
name: clio_deb_package_${{ runner.os }}_${{ inputs.build_type }}_${{ inputs.conan_profile }}
197197
path: build/*.deb

0 commit comments

Comments
 (0)