diff --git a/.github/actions/xahau-ga-dependencies/action.yml b/.github/actions/xahau-ga-dependencies/action.yml index b1aa1b534..8da022fe5 100644 --- a/.github/actions/xahau-ga-dependencies/action.yml +++ b/.github/actions/xahau-ga-dependencies/action.yml @@ -159,6 +159,4 @@ runs: --output-folder . \ --build missing \ --settings build_type=${{ inputs.configuration }} \ - -Dtests=TRUE \ - -Dxrpld=TRUE \ .. diff --git a/build-core.sh b/build-core.sh index e552d210c..b176681ce 100755 --- a/build-core.sh +++ b/build-core.sh @@ -49,7 +49,7 @@ export LDFLAGS="-static-libstdc++" git config --global --add safe.directory /io && git checkout src/libxrpl/protocol/BuildInfo.cpp && -sed -i s/\"0.0.0\"/\"$(date +%Y).$(date +%-m).$(date +%-d)-$(git rev-parse --abbrev-ref HEAD)$(if [ -n "$4" ]; then echo "+$4"; fi)\"/g src/ripple/protocol/impl/BuildInfo.cpp && +sed -i s/\"0.0.0\"/\"$(date +%Y).$(date +%-m).$(date +%-d)-$(git rev-parse --abbrev-ref HEAD)$(if [ -n "$4" ]; then echo "+$4"; fi)\"/g src/libxrpl/protocol/BuildInfo.cpp && conan export external/snappy --version 1.1.10 --user xahaud --channel stable && conan export external/soci --version 4.0.3 --user xahaud --channel stable && conan export external/wasmedge --version 0.11.2 --user xahaud --channel stable && diff --git a/release-builder.sh b/release-builder.sh index e3d55b86a..4cd0d0132 100755 --- a/release-builder.sh +++ b/release-builder.sh @@ -94,7 +94,7 @@ RUN /hbb_exe/activate-exec bash -c "dnf install -y epel-release && \ # Install Conan 2 and CMake RUN /hbb_exe/activate-exec pip3 install "conan>=2.0,<3.0" && \ - /hbb_exe/activate-exec wget -q https://github.com/Kitware/CMake/releases/download/v3.23.1/cmake-3.23.1-linux-x86_64.tar.gz -O cmake.tar.gz && \ + /hbb_exe/activate-exec wget -q https://github.com/Kitware/CMake/releases/download/v3.25.3/cmake-3.25.3-linux-x86_64.tar.gz -O cmake.tar.gz && \ mkdir cmake && \ tar -xzf cmake.tar.gz --strip-components=1 -C cmake && \ rm cmake.tar.gz