Update package building scripts and images to use Conan #4435

legleux · 2023-02-24T00:46:56Z

High Level Overview of Change

Lots of changes needed to update the docker containers we use to build DEB and RPM packages.

Context of Change

rippled's dependencies are handled by Conan now so the package building process needs to be updated.

bump version to rc3
test on Fedora 37
rm docker user mapping on container builds (doesn't work with conan)
rm dpkg dev pkg (was broken anyway)
rm dependency builds (dependencies are handled by Conan now)

Supersedes #4362

Type of Change

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
Refactor (non-breaking change that only restructures code)
Tests (You added tests for code that already exists, or your new feature included in this PR)
Documentation Updates
Release

bump version to rc3 test on Fedora 37 rm docker user mapping on container builds (doesn't work with conan) rm dpkg dev pkg (was broken anyway) rm dependency builds (handled by Conan now)

legleux · 2023-02-24T00:48:27Z

@thejohnfreeman I'm still unsure about the removal from RippledRelease.cmake of

# Early return if the `containers` directory is missing,
# e.g. when we are building a Conan package.
if(NOT EXISTS containers)
  return()
endif()

Builds/containers/ubuntu-builder/ubuntu_setup.sh

Builds/containers/shared/install_cmake.sh

thejohnfreeman · 2023-02-24T17:23:15Z

Builds/containers/ubuntu-builder/Dockerfile

 RUN if [ "${CI_USE}" = true ] ; then /tmp/install_cmake.sh 3.9.0 /opt/local/cmake-3.9; fi

-RUN /tmp/build_deps.sh
-ENV PLANTUML_JAR="/opt/plantuml/plantuml.jar"


Why is PlantUML gone? We need it to build the Doxygen documentation.

Builds/containers/packaging/rpm/rippled.spec

Builds/containers/packaging/dpkg/debian/rules

thejohnfreeman · 2023-02-24T19:21:27Z

Builds/containers/centos-builder/Dockerfile

+RUN /tmp/install_cmake.sh 3.16.3 /opt/local/cmake-3.16
 RUN ln -s /opt/local/cmake-3.16 /opt/local/cmake
 ENV PATH="/opt/local/cmake/bin:$PATH"
-# also install min supported cmake for testing
-RUN if [ "${CI_USE}" = true ] ; then /tmp/install_cmake.sh 3.9.0 /opt/local/cmake-3.9; fi
+# TODO: Install latest CMake for testing
+RUN if [ "${CI_USE}" = true ] ; then /tmp/install_cmake.sh 3.16.3 /opt/local/cmake-3.16; fi


See my comments on the Ubuntu Dockerfile for my thoughts on moving all these RUN commands to the install script and greatly simplifying / trivializing the Dockerfile.

Builds/CMake/RippledRelease.cmake

intelliot · 2023-02-25T00:31:07Z

I guess this might be a flaky test. I kicked it off again.

1> ripple.app.LedgerData
0> #299 failed: apply: Got temINVALID (The transaction is ill-formed.); Expected tesSUCCESS (The transaction was applied. Only final in a validated ledger.)
0> {
   "Account" : "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
   "Amount" : "1000000010",
   "Destination" : "rJP5kd48NUvKuEMUUNdByiQCauJVYURBz8",
   "Fee" : "10",
   "Flags" : 2147483648,
   "Sequence" : 51,
   "SigningPubKey" : "0330E7FC9D56BB25D6893BA3F317AE5BCF33B3291BD63DB32654A313222F7FD020",
   "TransactionType" : "Payment",
   "TxnSignature" : "304502210092D9DA00AAE0404640A8697028B3E36BA45FCA7[500](https:/XRPLF/rippled/actions/runs/4266933705/jobs/7428013711#step:19:501)D475FAC8F6B97B01B1D80902206B51127825AD3AE0ED3F7CE16CC665533571BAF49B852B4B1E69DBD552BFA4E0"
}

0> #300 failed: unhandled exception: unexpected missing account root
0> ripple.app.LedgerReplayer ProofPath

sgramkumar

LGTM. Just a minor indentation missing

sgramkumar · 2023-02-27T21:19:26Z

Builds/containers/ubuntu-builder/ubuntu_setup.sh

- --slave /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-dump-7 \
- --slave /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-tool-7
+if [[ ${VERSION_ID} =~ ^20\. ]] ; then
+apt-get install -y \


nit: indentation missing

sgramkumar · 2023-02-27T21:20:02Z

Builds/containers/ubuntu-builder/ubuntu_setup.sh

-if [ "${CI_USE}" = true ] ; then
+apt-get -y update
+if [[ ${VERSION_ID} =~ ^20\. ]] ; then
+for v in 12 14; do


nit: indentation missing

HowardHinnant

I started with a empty ~/.conan/data, and it installed, generated, built and tested without errors for me on macOS, using the directions in BUILD.md.

intelliot · 2023-02-28T00:40:39Z

@legleux to confirm this is ready to merge, you can put the Passed label on it (or comment saying it's ready)

legleux · 2023-02-28T00:45:35Z

How about that, I can add labels?
Let's merge it.

* upstream/develop: Update package building scripts and images to use Conan (XRPLF#4435) Disable duplicate detector: (XRPLF#4438)

* upstream/develop: Set version to 1.10.0-rc4 Rename 'NFT' to 'NFToken' in DisallowIncoming flags (XRPLF#4442) Update Docker.md (XRPLF#4432) Update package building scripts and images to use Conan (XRPLF#4435) Disable duplicate detector: (XRPLF#4438)

…ctionality * upstream/develop: Set version to 1.10.0-rc4 Rename 'NFT' to 'NFToken' in DisallowIncoming flags (XRPLF#4442) Update Docker.md (XRPLF#4432) Update package building scripts and images to use Conan (XRPLF#4435) Disable duplicate detector: (XRPLF#4438)

…tpage * upstream/develop: Set version to 1.10.0-rc4 Rename 'NFT' to 'NFToken' in DisallowIncoming flags (XRPLF#4442) Update Docker.md (XRPLF#4432) Update package building scripts and images to use Conan (XRPLF#4435) Disable duplicate detector: (XRPLF#4438)

* Set version to 1.10.0-rc3 * Test on Fedora 37 * Dependency builds are handled by Conan

Update package build images for Conan

d6a78d9

bump version to rc3 test on Fedora 37 rm docker user mapping on container builds (doesn't work with conan) rm dpkg dev pkg (was broken anyway) rm dependency builds (handled by Conan now)

legleux requested review from thejohnfreeman, manojsdoshi and intelliot and removed request for thejohnfreeman February 24, 2023 00:48

intelliot assigned thejohnfreeman Feb 24, 2023

intelliot requested a review from sgramkumar February 24, 2023 18:35

thejohnfreeman requested changes Feb 24, 2023

View reviewed changes

intelliot assigned legleux Feb 24, 2023

Address some PR comments

220aa84

thejohnfreeman approved these changes Feb 25, 2023

View reviewed changes

intelliot assigned sgramkumar and ximinez and unassigned legleux and thejohnfreeman Feb 25, 2023

intelliot requested a review from HowardHinnant February 27, 2023 20:15

intelliot added this to the 1.10.0 milestone Feb 27, 2023

intelliot assigned HowardHinnant Feb 27, 2023

sgramkumar reviewed Feb 27, 2023

View reviewed changes

HowardHinnant approved these changes Feb 27, 2023

View reviewed changes

sgramkumar approved these changes Feb 27, 2023

View reviewed changes

intelliot unassigned sgramkumar, HowardHinnant and ximinez Feb 27, 2023

legleux added the Passed Passed code review & PR owner thinks it's ready to merge. Perf sign-off may still be required. label Feb 28, 2023

intelliot merged commit e13676f into XRPLF:develop Feb 28, 2023

ximinez added a commit to ximinez/rippled that referenced this pull request Mar 2, 2023

Merge remote-tracking branch 'upstream/develop' into site-timeout

d704656

* upstream/develop: Update package building scripts and images to use Conan (XRPLF#4435) Disable duplicate detector: (XRPLF#4438)

dangell7 pushed a commit to Transia-RnD/rippled that referenced this pull request Mar 5, 2023

Update package building scripts and images to use Conan (XRPLF#4435)

ec7aa43

* Set version to 1.10.0-rc3 * Test on Fedora 37 * Dependency builds are handled by Conan

legleux mentioned this pull request Mar 9, 2023

Update docker images that build packages #4362

Closed

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update package building scripts and images to use Conan #4435

Update package building scripts and images to use Conan #4435

legleux commented Feb 24, 2023 •

edited

Loading

legleux commented Feb 24, 2023

thejohnfreeman Feb 24, 2023

thejohnfreeman Feb 24, 2023

intelliot commented Feb 25, 2023

sgramkumar left a comment

sgramkumar Feb 27, 2023

sgramkumar Feb 27, 2023

HowardHinnant left a comment

intelliot commented Feb 28, 2023

legleux commented Feb 28, 2023

Update package building scripts and images to use Conan #4435

Update package building scripts and images to use Conan #4435

Conversation

legleux commented Feb 24, 2023 • edited Loading

High Level Overview of Change

Context of Change

Type of Change

legleux commented Feb 24, 2023

thejohnfreeman Feb 24, 2023

Choose a reason for hiding this comment

thejohnfreeman Feb 24, 2023

Choose a reason for hiding this comment

intelliot commented Feb 25, 2023

sgramkumar left a comment

Choose a reason for hiding this comment

sgramkumar Feb 27, 2023

Choose a reason for hiding this comment

sgramkumar Feb 27, 2023

Choose a reason for hiding this comment

HowardHinnant left a comment

Choose a reason for hiding this comment

intelliot commented Feb 28, 2023

legleux commented Feb 28, 2023

legleux commented Feb 24, 2023 •

edited

Loading