Skip to content

Commit 5bbba27

Browse files
kuznetssskuznetsss
committed
Add syncing cache with DB
2 parents f1895d5 + 1a48dd7 commit 5bbba27

Some content is hidden

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

43 files changed

+532
-334
lines changed

‎.github/actions/cmake/action.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ inputs:
3737
description: Whether to generate Debian package
3838
required: true
3939
default: "false"
40+
version:
41+
description: Version of the clio_server binary
42+
required: false
43+
default: ""
4044

4145
runs:
4246
using: composite
@@ -57,6 +61,19 @@ runs:
5761
STATIC: "${{ inputs.static == 'true' && 'ON' || 'OFF' }}"
5862
TIME_TRACE: "${{ inputs.time_trace == 'true' && 'ON' || 'OFF' }}"
5963
PACKAGE: "${{ inputs.package == 'true' && 'ON' || 'OFF' }}"
64+
# GitHub creates a merge commit for a PR
65+
# https://www.kenmuse.com/blog/the-many-shas-of-a-github-pull-request/
66+
#
67+
# We:
68+
# - explicitly provide branch name
69+
# - use `github.head_ref` to get the SHA of last commit in the PR branch
70+
#
71+
# This way it works both for PRs and pushes to branches.
72+
GITHUB_BRANCH_NAME: "${{ github.head_ref || github.ref_name }}"
73+
GITHUB_HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}"
74+
#
75+
# If tag is being pushed, or it's a nightly release, we use that version.
76+
FORCE_CLIO_VERSION: ${{ inputs.version }}
6077
run: |
6178
cmake \
6279
-B "${BUILD_DIR}" \

‎.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:067449c3f8ae6755ea84752ea2962b589fe56c8f" }'
7+
'{ "image": "ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696" }'
88
]
99
LINUX_COMPILERS = ["gcc", "clang"]
1010

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ on:
2323
- "cmake/**"
2424
- "src/**"
2525
- "tests/**"
26+
- "benchmarks/**"
2627

2728
- docs/config-description.md
2829
workflow_dispatch:
@@ -49,7 +50,7 @@ jobs:
4950
build_type: [Release, Debug]
5051
container:
5152
[
52-
'{ "image": "ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f" }',
53+
'{ "image": "ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696" }',
5354
]
5455
static: [true]
5556

@@ -79,7 +80,7 @@ jobs:
7980
uses: ./.github/workflows/reusable-build.yml
8081
with:
8182
runs_on: heavy
82-
container: '{ "image": "ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f" }'
83+
container: '{ "image": "ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696" }'
8384
conan_profile: gcc
8485
build_type: Debug
8586
download_ccache: true
@@ -97,7 +98,7 @@ jobs:
9798
needs: build-and-test
9899
runs-on: heavy
99100
container:
100-
image: ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f
101+
image: ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696
101102

102103
steps:
103104
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1

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

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

2626
steps:
2727
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2828
with:
2929
fetch-depth: 0
3030

3131
- name: Prepare runner
32-
uses: XRPLF/actions/prepare-runner@2ece4ec6ab7de266859a6f053571425b2bd684b6
32+
uses: XRPLF/actions/prepare-runner@e8d2d2a546a03e1d161dca52890705f3bc641215
3333
with:
34-
disable_ccache: true
34+
enable_ccache: false
3535

3636
- name: Update libXRPL version requirement
3737
run: |
@@ -69,7 +69,7 @@ jobs:
6969
needs: build
7070
runs-on: heavy
7171
container:
72-
image: ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f
72+
image: ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696
7373

7474
steps:
7575
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ 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:067449c3f8ae6755ea84752ea2962b589fe56c8f
34+
image: ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696
3535

3636
permissions:
3737
contents: write
@@ -44,9 +44,9 @@ jobs:
4444
fetch-depth: 0
4545

4646
- name: Prepare runner
47-
uses: XRPLF/actions/prepare-runner@2ece4ec6ab7de266859a6f053571425b2bd684b6
47+
uses: XRPLF/actions/prepare-runner@e8d2d2a546a03e1d161dca52890705f3bc641215
4848
with:
49-
disable_ccache: true
49+
enable_ccache: false
5050

5151
- name: Run conan
5252
uses: ./.github/actions/conan

‎.github/workflows/docs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
build:
1919
runs-on: ubuntu-latest
2020
container:
21-
image: ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f
21+
image: ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696
2222

2323
steps:
2424
- name: Checkout
@@ -27,9 +27,9 @@ jobs:
2727
lfs: true
2828

2929
- name: Prepare runner
30-
uses: XRPLF/actions/prepare-runner@2ece4ec6ab7de266859a6f053571425b2bd684b6
30+
uses: XRPLF/actions/prepare-runner@e8d2d2a546a03e1d161dca52890705f3bc641215
3131
with:
32-
disable_ccache: true
32+
enable_ccache: false
3333

3434
- name: Create build directory
3535
run: mkdir build_docs

‎.github/workflows/nightly.yml‎

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,20 @@ defaults:
2828
shell: bash
2929

3030
jobs:
31+
get_date:
32+
name: Get Date
33+
runs-on: ubuntu-latest
34+
outputs:
35+
date: ${{ steps.get_date.outputs.date }}
36+
steps:
37+
- name: Get current date
38+
id: get_date
39+
run: |
40+
echo "date=$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
41+
3142
build-and-test:
3243
name: Build and Test
44+
needs: get_date
3345

3446
strategy:
3547
fail-fast: false
@@ -43,17 +55,17 @@ jobs:
4355
conan_profile: gcc
4456
build_type: Release
4557
static: true
46-
container: '{ "image": "ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f" }'
58+
container: '{ "image": "ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696" }'
4759
- os: heavy
4860
conan_profile: gcc
4961
build_type: Debug
5062
static: true
51-
container: '{ "image": "ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f" }'
63+
container: '{ "image": "ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696" }'
5264
- os: heavy
5365
conan_profile: gcc.ubsan
5466
build_type: Release
5567
static: false
56-
container: '{ "image": "ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f" }'
68+
container: '{ "image": "ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696" }'
5769

5870
uses: ./.github/workflows/reusable-build-test.yml
5971
with:
@@ -67,14 +79,16 @@ jobs:
6779
upload_clio_server: true
6880
download_ccache: false
6981
upload_ccache: false
82+
version: nightly-${{ needs.get_date.outputs.date }}
7083

7184
package:
7285
name: Build debian package
86+
needs: get_date
7387

7488
uses: ./.github/workflows/reusable-build.yml
7589
with:
7690
runs_on: heavy
77-
container: '{ "image": "ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f" }'
91+
container: '{ "image": "ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696" }'
7892
conan_profile: gcc
7993
build_type: Release
8094
download_ccache: false
@@ -83,19 +97,21 @@ jobs:
8397
static: true
8498
upload_clio_server: false
8599
package: true
100+
version: nightly-${{ needs.get_date.outputs.date }}
86101
targets: package
87102
analyze_build_time: false
88103

89104
analyze_build_time:
90105
name: Analyze Build Time
106+
needs: get_date
91107

92108
strategy:
93109
fail-fast: false
94110
matrix:
95111
include:
96112
- os: heavy
97113
conan_profile: clang
98-
container: '{ "image": "ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f" }'
114+
container: '{ "image": "ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696" }'
99115
static: true
100116
- os: macos15
101117
conan_profile: apple-clang
@@ -114,17 +130,7 @@ jobs:
114130
upload_clio_server: false
115131
targets: all
116132
analyze_build_time: true
117-
118-
get_date:
119-
name: Get Date
120-
runs-on: ubuntu-latest
121-
outputs:
122-
date: ${{ steps.get_date.outputs.date }}
123-
steps:
124-
- name: Get current date
125-
id: get_date
126-
run: |
127-
echo "date=$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
133+
version: nightly-${{ needs.get_date.outputs.date }}
128134

129135
nightly_release:
130136
needs: [build-and-test, package, get_date]

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

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

1313
jobs:
1414
auto-update:
15-
uses: XRPLF/actions/.github/workflows/pre-commit-autoupdate.yml@afbcbdafbe0ce5439492fb87eda6441371086386
15+
uses: XRPLF/actions/.github/workflows/pre-commit-autoupdate.yml@ad4ab1ae5a54a4bab0e87294c31fc0729f788b2b
1616
with:
1717
sign_commit: true
1818
committer: "Clio CI <skuznetsov@ripple.com>"

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

Lines changed: 2 additions & 2 deletions
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@34790936fae4c6c751f62ec8c06696f9c1a5753a
11+
uses: XRPLF/actions/.github/workflows/pre-commit.yml@01163508e81d7dd63d4601d4090b297a260b18c2
1212
with:
1313
runs_on: heavy
14-
container: '{ "image": "ghcr.io/xrplf/clio-pre-commit:067449c3f8ae6755ea84752ea2962b589fe56c8f" }'
14+
container: '{ "image": "ghcr.io/xrplf/clio-pre-commit:14342e087ceb8b593027198bf9ef06a43833c696" }'

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
conan_profile: gcc
3030
build_type: Release
3131
static: true
32-
container: '{ "image": "ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f" }'
32+
container: '{ "image": "ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696" }'
3333

3434
uses: ./.github/workflows/reusable-build-test.yml
3535
with:
@@ -43,15 +43,15 @@ jobs:
4343
upload_clio_server: true
4444
download_ccache: false
4545
upload_ccache: false
46-
expected_version: ${{ github.event_name == 'push' && github.ref_name || '' }}
46+
version: ${{ github.event_name == 'push' && github.ref_name || '' }}
4747

4848
package:
4949
name: Build debian package
5050

5151
uses: ./.github/workflows/reusable-build.yml
5252
with:
5353
runs_on: heavy
54-
container: '{ "image": "ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f" }'
54+
container: '{ "image": "ghcr.io/xrplf/clio-ci:14342e087ceb8b593027198bf9ef06a43833c696" }'
5555
conan_profile: gcc
5656
build_type: Release
5757
download_ccache: false
@@ -60,6 +60,7 @@ jobs:
6060
static: true
6161
upload_clio_server: false
6262
package: true
63+
version: ${{ github.event_name == 'push' && github.ref_name || '' }}
6364
targets: package
6465
analyze_build_time: false
6566

0 commit comments

Comments
 (0)