Skip to content

Commit c59fcf3

Browse files
authored
chore: Commits for 2.7.0-rc2 (#2868)
2 parents c35649e + 2327e81 commit c59fcf3

23 files changed

+316
-130
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ runs:
1414
using: composite
1515
steps:
1616
- name: Get number of processors
17-
uses: XRPLF/actions/.github/actions/get-nproc@046b1620f6bfd6cd0985dc82c3df02786801fe0a
17+
uses: XRPLF/actions/get-nproc@cf0433aa74563aead044a1e395610c96d65a37cf
1818
id: nproc
1919
with:
2020
subtract: ${{ inputs.nproc_subtract }}

.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@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
27+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
2828
with:
2929
name: coverage-report.xml
3030
path: build/coverage_report.xml

.github/actions/conan/action.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ inputs:
2121
runs:
2222
using: composite
2323
steps:
24-
- name: Create build directory
25-
shell: bash
26-
run: mkdir -p "${{ inputs.build_dir }}"
27-
2824
- name: Run conan
2925
shell: bash
3026
env:
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#!/usr/bin/env bash
2+
3+
set -ex
4+
5+
TEMP_DIR=$(mktemp -d)
6+
trap "rm -rf $TEMP_DIR" EXIT
7+
8+
echo "Using temporary CONAN_HOME: $TEMP_DIR"
9+
10+
# We use a temporary Conan home to avoid polluting the user's existing Conan
11+
# configuration and to not use local cache (which leads to non-reproducible lockfiles).
12+
export CONAN_HOME="$TEMP_DIR"
13+
14+
# Ensure that the xrplf remote is the first to be consulted, so any recipes we
15+
# patched are used. We also add it there to not created huge diff when the
16+
# official Conan Center Index is updated.
17+
conan remote add --force --index 0 xrplf https://conan.ripplex.io
18+
19+
# Delete any existing lockfile.
20+
rm -f conan.lock
21+
22+
# Create a new lockfile that is compatible with macOS.
23+
# It should also work on Linux.
24+
conan lock create . \
25+
--profile:all=.github/scripts/conan/apple-clang-17.profile

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

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

5353
- name: Download Clio binary from artifact
5454
if: ${{ inputs.artifact_name != null }}
55-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
55+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
5656
with:
5757
name: ${{ inputs.artifact_name }}
5858
path: ./docker/clio/artifact/

.github/workflows/build.yml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -92,24 +92,6 @@ jobs:
9292
secrets:
9393
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
9494

95-
package:
96-
name: Build packages
97-
98-
uses: ./.github/workflows/reusable-build.yml
99-
with:
100-
runs_on: heavy
101-
container: '{ "image": "ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f" }'
102-
conan_profile: gcc
103-
build_type: Release
104-
download_ccache: true
105-
upload_ccache: false
106-
code_coverage: false
107-
static: true
108-
upload_clio_server: false
109-
package: true
110-
targets: package
111-
analyze_build_time: false
112-
11395
check_config:
11496
name: Check Config Description
11597
needs: build-and-test
@@ -120,7 +102,7 @@ jobs:
120102
steps:
121103
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
122104

123-
- uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
105+
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
124106
with:
125107
name: clio_server_Linux_Release_gcc
126108

.github/workflows/check-libxrpl.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
fetch-depth: 0
3030

3131
- name: Prepare runner
32-
uses: XRPLF/actions/.github/actions/prepare-runner@8abb0722cbff83a9a2dc7d06c473f7a4964b7382
32+
uses: XRPLF/actions/prepare-runner@2ece4ec6ab7de266859a6f053571425b2bd684b6
3333
with:
3434
disable_ccache: true
3535

@@ -59,7 +59,7 @@ jobs:
5959
run: strip build/clio_tests
6060

6161
- name: Upload clio_tests
62-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
62+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
6363
with:
6464
name: clio_tests_check_libxrpl
6565
path: build/clio_tests
@@ -72,7 +72,7 @@ jobs:
7272
image: ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f
7373

7474
steps:
75-
- uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
75+
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
7676
with:
7777
name: clio_tests_check_libxrpl
7878

.github/workflows/clang-tidy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
fetch-depth: 0
4545

4646
- name: Prepare runner
47-
uses: XRPLF/actions/.github/actions/prepare-runner@8abb0722cbff83a9a2dc7d06c473f7a4964b7382
47+
uses: XRPLF/actions/prepare-runner@2ece4ec6ab7de266859a6f053571425b2bd684b6
4848
with:
4949
disable_ccache: true
5050

@@ -59,7 +59,7 @@ jobs:
5959
conan_profile: ${{ env.CONAN_PROFILE }}
6060

6161
- name: Get number of processors
62-
uses: XRPLF/actions/.github/actions/get-nproc@046b1620f6bfd6cd0985dc82c3df02786801fe0a
62+
uses: XRPLF/actions/get-nproc@cf0433aa74563aead044a1e395610c96d65a37cf
6363
id: nproc
6464

6565
- name: Run clang-tidy (several times)
@@ -107,7 +107,7 @@ jobs:
107107

108108
- name: Create PR with fixes
109109
if: ${{ steps.files_changed.outcome != 'success' && github.event_name != 'pull_request' }}
110-
uses: peter-evans/create-pull-request@22a9089034f40e5a961c8808d113e2c98fb63676 # v7.0.11
110+
uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725 # v8.0.0
111111
env:
112112
GH_REPO: ${{ github.repository }}
113113
GH_TOKEN: ${{ github.token }}

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
lfs: true
2828

2929
- name: Prepare runner
30-
uses: XRPLF/actions/.github/actions/prepare-runner@8abb0722cbff83a9a2dc7d06c473f7a4964b7382
30+
uses: XRPLF/actions/prepare-runner@2ece4ec6ab7de266859a6f053571425b2bd684b6
3131
with:
3232
disable_ccache: true
3333

.github/workflows/nightly.yml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,24 @@ jobs:
6868
download_ccache: false
6969
upload_ccache: false
7070

71+
package:
72+
name: Build debian package
73+
74+
uses: ./.github/workflows/reusable-build.yml
75+
with:
76+
runs_on: heavy
77+
container: '{ "image": "ghcr.io/xrplf/clio-ci:067449c3f8ae6755ea84752ea2962b589fe56c8f" }'
78+
conan_profile: gcc
79+
build_type: Release
80+
download_ccache: false
81+
upload_ccache: false
82+
code_coverage: false
83+
static: true
84+
upload_clio_server: false
85+
package: true
86+
targets: package
87+
analyze_build_time: false
88+
7189
analyze_build_time:
7290
name: Analyze Build Time
7391

@@ -109,7 +127,7 @@ jobs:
109127
echo "date=$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
110128
111129
nightly_release:
112-
needs: [build-and-test, get_date]
130+
needs: [build-and-test, package, get_date]
113131
uses: ./.github/workflows/reusable-release.yml
114132
with:
115133
delete_pattern: "nightly-*"

0 commit comments

Comments
 (0)