From 7661ee6a3bccee941c9dd29d2ab13f7092a647e6 Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Mon, 23 Jun 2025 11:38:28 +0100 Subject: [PATCH] fix: Make update-libxrpl-version work with lockfile (#2249) --- .github/scripts/update-libxrpl-version | 28 -------------------------- .github/workflows/check_libxrpl.yml | 8 +++++++- 2 files changed, 7 insertions(+), 29 deletions(-) delete mode 100755 .github/scripts/update-libxrpl-version diff --git a/.github/scripts/update-libxrpl-version b/.github/scripts/update-libxrpl-version deleted file mode 100755 index da2da55c..00000000 --- a/.github/scripts/update-libxrpl-version +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -# Note: This script is intended to be run from the root of the repository. -# -# This script modifies conanfile.py such that the specified version of libXRPL is used. - -if [[ -z "$1" ]]; then - cat <&1 | grep -q 'GNU' && echo true || echo false) - -echo "+ Updating required libXRPL version to $VERSION" - -if [[ "$GNU_SED" == "false" ]]; then - sed -i '' -E "s|'xrpl/[a-zA-Z0-9\\.\\-]+'|'xrpl/$VERSION'|g" conanfile.py -else - sed -i -E "s|'xrpl/[a-zA-Z0-9\\.\\-]+'|'xrpl/$VERSION'|g" conanfile.py -fi diff --git a/.github/workflows/check_libxrpl.yml b/.github/workflows/check_libxrpl.yml index 5783c830..1c8cca62 100644 --- a/.github/workflows/check_libxrpl.yml +++ b/.github/workflows/check_libxrpl.yml @@ -27,7 +27,13 @@ jobs: - name: Update libXRPL version requirement shell: bash run: | - ./.github/scripts/update-libxrpl-version ${{ github.event.client_payload.version }} + sed -i.bak -E "s|'xrpl/[a-zA-Z0-9\\.\\-]+'|'xrpl/${{ github.event.client_payload.version }}'|g" conanfile.py + rm -f conanfile.py.bak + + - name: Update conan lockfile + shell: bash + run: | + conan lock create . -o '&:tests=True' -o '&:benchmark=True' - name: Prepare runner uses: ./.github/actions/prepare_runner