Skip to content

Commit c35649e

Browse files
authored
chore: Commits for 2.7.0-rc1 (#2846)
2 parents 4da4b49 + f2f5a6a commit c35649e

File tree

104 files changed

+3193
-694
lines changed

Some content is hidden

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

104 files changed

+3193
-694
lines changed

.github/actions/build-docker-image/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ runs:
5252
cache-image: false
5353
- uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
5454

55-
- uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # v5.9.0
55+
- uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
5656
id: meta
5757
with:
5858
images: ${{ inputs.images }}

.github/scripts/conan/generate_matrix.py

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

55
LINUX_OS = ["heavy", "heavy-arm64"]
66
LINUX_CONTAINERS = [
7-
'{ "image": "ghcr.io/xrplf/clio-ci:77387d8f9f13aea8f23831d221ac3e7683bb69b7" }'
7+
'{ "image": "ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f" }'
88
]
99
LINUX_COMPILERS = ["gcc", "clang"]
1010

.github/scripts/conan/init.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ mkdir -p "$PROFILES_DIR"
4040

4141
if [[ "$(uname)" == "Darwin" ]]; then
4242
create_profile_with_sanitizers "apple-clang" "$APPLE_CLANG_PROFILE"
43-
echo "include(apple-clang)" > "$PROFILES_DIR/default"
43+
echo "include(apple-clang)" >"$PROFILES_DIR/default"
4444
else
4545
create_profile_with_sanitizers "clang" "$CLANG_PROFILE"
4646
create_profile_with_sanitizers "gcc" "$GCC_PROFILE"
47-
echo "include(gcc)" > "$PROFILES_DIR/default"
47+
echo "include(gcc)" >"$PROFILES_DIR/default"
4848
fi

.github/scripts/execute-tests-under-sanitizer.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ fi
2222
TEST_BINARY=$1
2323

2424
if [[ ! -f "$TEST_BINARY" ]]; then
25-
echo "Test binary not found: $TEST_BINARY"
26-
exit 1
25+
echo "Test binary not found: $TEST_BINARY"
26+
exit 1
2727
fi
2828

2929
TESTS=$($TEST_BINARY --gtest_list_tests | awk '/^ / {print suite $1} !/^ / {suite=$1}')
@@ -35,12 +35,12 @@ export TSAN_OPTIONS="die_after_fork=0"
3535
export MallocNanoZone='0' # for MacOSX
3636

3737
for TEST in $TESTS; do
38-
OUTPUT_FILE="$OUTPUT_DIR/${TEST//\//_}.log"
39-
$TEST_BINARY --gtest_filter="$TEST" > "$OUTPUT_FILE" 2>&1
40-
41-
if [ $? -ne 0 ]; then
42-
echo "'$TEST' failed a sanitizer check."
43-
else
44-
rm "$OUTPUT_FILE"
45-
fi
38+
OUTPUT_FILE="$OUTPUT_DIR/${TEST//\//_}.log"
39+
$TEST_BINARY --gtest_filter="$TEST" >"$OUTPUT_FILE" 2>&1
40+
41+
if [ $? -ne 0 ]; then
42+
echo "'$TEST' failed a sanitizer check."
43+
else
44+
rm "$OUTPUT_FILE"
45+
fi
4646
done

.github/scripts/prepare-release-artifacts.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ for artifact_name in $(ls); do
2020
rm "${artifact_name}/${BINARY_NAME}"
2121
rm -r "${artifact_name}"
2222

23-
sha256sum "./${artifact_name}.zip" > "./${artifact_name}.zip.sha256sum"
23+
sha256sum "./${artifact_name}.zip" >"./${artifact_name}.zip.sha256sum"
2424
done

.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
runs-on: ubuntu-latest
4949

5050
steps:
51-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
51+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
5252

5353
- name: Download Clio binary from artifact
5454
if: ${{ inputs.artifact_name != null }}

.github/workflows/build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
build_type: [Release, Debug]
5050
container:
5151
[
52-
'{ "image": "ghcr.io/xrplf/clio-ci:77387d8f9f13aea8f23831d221ac3e7683bb69b7" }',
52+
'{ "image": "ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f" }',
5353
]
5454
static: [true]
5555

@@ -79,7 +79,7 @@ jobs:
7979
uses: ./.github/workflows/reusable-build.yml
8080
with:
8181
runs_on: heavy
82-
container: '{ "image": "ghcr.io/xrplf/clio-ci:77387d8f9f13aea8f23831d221ac3e7683bb69b7" }'
82+
container: '{ "image": "ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f" }'
8383
conan_profile: gcc
8484
build_type: Debug
8585
download_ccache: true
@@ -98,7 +98,7 @@ jobs:
9898
uses: ./.github/workflows/reusable-build.yml
9999
with:
100100
runs_on: heavy
101-
container: '{ "image": "ghcr.io/xrplf/clio-ci:77387d8f9f13aea8f23831d221ac3e7683bb69b7" }'
101+
container: '{ "image": "ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f" }'
102102
conan_profile: gcc
103103
build_type: Release
104104
download_ccache: true
@@ -115,10 +115,10 @@ jobs:
115115
needs: build-and-test
116116
runs-on: heavy
117117
container:
118-
image: ghcr.io/xrplf/clio-ci:77387d8f9f13aea8f23831d221ac3e7683bb69b7
118+
image: ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f
119119

120120
steps:
121-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
121+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
122122

123123
- uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
124124
with:

.github/workflows/check-libxrpl.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
name: Build Clio / `libXRPL ${{ github.event.client_payload.version }}`
2222
runs-on: heavy
2323
container:
24-
image: ghcr.io/xrplf/clio-ci:77387d8f9f13aea8f23831d221ac3e7683bb69b7
24+
image: ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f
2525

2626
steps:
27-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
27+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2828
with:
2929
fetch-depth: 0
3030

@@ -69,7 +69,7 @@ jobs:
6969
needs: build
7070
runs-on: heavy
7171
container:
72-
image: ghcr.io/xrplf/clio-ci:77387d8f9f13aea8f23831d221ac3e7683bb69b7
72+
image: ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f
7373

7474
steps:
7575
- uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
@@ -92,7 +92,7 @@ jobs:
9292
issues: write
9393

9494
steps:
95-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
95+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
9696

9797
- name: Create an issue
9898
uses: ./.github/actions/create-issue

.github/workflows/check-pr-title.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
- uses: ytanikin/pr-conventional-commits@b72758283dcbee706975950e96bc4bf323a8d8c0 # 1.4.2
17+
- uses: ytanikin/pr-conventional-commits@fda730cb152c05a849d6d84325e50c6182d9d1e9 # 1.5.1
1818
with:
1919
task_types: '["build","feat","fix","docs","test","ci","style","refactor","perf","chore"]'
2020
add_label: false

.github/workflows/clang-tidy.yml

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ jobs:
3131
if: github.event_name != 'push' || contains(github.event.head_commit.message, 'clang-tidy auto fixes')
3232
runs-on: heavy
3333
container:
34-
image: ghcr.io/xrplf/clio-ci:77387d8f9f13aea8f23831d221ac3e7683bb69b7
34+
image: ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f
3535

3636
permissions:
3737
contents: write
3838
issues: write
3939
pull-requests: write
4040

4141
steps:
42-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
42+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
4343
with:
4444
fetch-depth: 0
4545

@@ -62,27 +62,30 @@ jobs:
6262
uses: XRPLF/actions/.github/actions/get-nproc@046b1620f6bfd6cd0985dc82c3df02786801fe0a
6363
id: nproc
6464

65-
- name: Run clang-tidy
65+
- name: Run clang-tidy (several times)
6666
continue-on-error: true
67-
id: run_clang_tidy
67+
id: clang_tidy
6868
run: |
69-
run-clang-tidy-${{ env.LLVM_TOOLS_VERSION }} -p build -j "${{ steps.nproc.outputs.nproc }}" -fix -quiet 1>output.txt
69+
# We run clang-tidy several times, because some fixes may enable new fixes in subsequent runs.
70+
CLANG_TIDY_COMMAND="run-clang-tidy-${{ env.LLVM_TOOLS_VERSION }} -p build -j ${{ steps.nproc.outputs.nproc }} -fix -quiet"
71+
${CLANG_TIDY_COMMAND} ||
72+
${CLANG_TIDY_COMMAND} ||
73+
${CLANG_TIDY_COMMAND}
74+
75+
- name: Check for changes
76+
id: files_changed
77+
continue-on-error: true
78+
run: |
79+
git diff --exit-code
7080
7181
- name: Fix local includes and clang-format style
72-
if: ${{ steps.run_clang_tidy.outcome != 'success' }}
82+
if: ${{ steps.files_changed.outcome != 'success' }}
7383
run: |
7484
pre-commit run --all-files fix-local-includes || true
7585
pre-commit run --all-files clang-format || true
7686
77-
- name: Print issues found
78-
if: ${{ steps.run_clang_tidy.outcome != 'success' }}
79-
run: |
80-
sed -i '/error\||/!d' ./output.txt
81-
cat output.txt
82-
rm output.txt
83-
8487
- name: Create an issue
85-
if: ${{ steps.run_clang_tidy.outcome != 'success' && github.event_name != 'pull_request' }}
88+
if: ${{ (steps.clang_tidy.outcome != 'success' || steps.files_changed.outcome != 'success') && github.event_name != 'pull_request' }}
8689
id: create_issue
8790
uses: ./.github/actions/create-issue
8891
env:
@@ -95,16 +98,16 @@ jobs:
9598
List of the issues found: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/
9699
97100
- uses: crazy-max/ghaction-import-gpg@e89d40939c28e39f97cf32126055eeae86ba74ec # v6.3.0
98-
if: ${{ steps.run_clang_tidy.outcome != 'success' && github.event_name != 'pull_request' }}
101+
if: ${{ steps.files_changed.outcome != 'success' && github.event_name != 'pull_request' }}
99102
with:
100103
gpg_private_key: ${{ secrets.ACTIONS_GPG_PRIVATE_KEY }}
101104
passphrase: ${{ secrets.ACTIONS_GPG_PASSPHRASE }}
102105
git_user_signingkey: true
103106
git_commit_gpgsign: true
104107

105108
- name: Create PR with fixes
106-
if: ${{ steps.run_clang_tidy.outcome != 'success' && github.event_name != 'pull_request' }}
107-
uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
109+
if: ${{ steps.files_changed.outcome != 'success' && github.event_name != 'pull_request' }}
110+
uses: peter-evans/create-pull-request@22a9089034f40e5a961c8808d113e2c98fb63676 # v7.0.11
108111
env:
109112
GH_REPO: ${{ github.repository }}
110113
GH_TOKEN: ${{ github.token }}
@@ -119,5 +122,5 @@ jobs:
119122
reviewers: "godexsoft,kuznetsss,PeterChen13579,mathbunnyru"
120123

121124
- name: Fail the job
122-
if: ${{ steps.run_clang_tidy.outcome != 'success' }}
125+
if: ${{ steps.clang_tidy.outcome != 'success' || steps.files_changed.outcome != 'success' }}
123126
run: exit 1

0 commit comments

Comments
 (0)