From 2ec02762ff98e01afd577361b1835777e5976456 Mon Sep 17 00:00:00 2001 From: Michael Legleux Date: Tue, 7 Apr 2026 23:39:57 -0700 Subject: [PATCH] pr comments --- .github/workflows/on-pr.yml | 6 ++++-- .github/workflows/on-tag.yml | 6 ++++-- .github/workflows/on-trigger.yml | 4 ++++ .github/workflows/reusable-package.yml | 20 ++++++++++---------- cmake/XrplPackaging.cmake | 3 ++- 5 files changed, 24 insertions(+), 15 deletions(-) diff --git a/.github/workflows/on-pr.yml b/.github/workflows/on-pr.yml index b741a0a732..f1cfb81d1f 100644 --- a/.github/workflows/on-pr.yml +++ b/.github/workflows/on-pr.yml @@ -149,13 +149,16 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + with: + sparse-checkout: | + .github/actions/generate-version + src/libxrpl/protocol/BuildInfo.cpp - name: Generate version id: version uses: ./.github/actions/generate-version package-deb: needs: [should-run, build-test, generate-version] - if: ${{ needs.should-run.outputs.go == 'true' }} uses: ./.github/workflows/reusable-package.yml with: pkg_type: deb @@ -165,7 +168,6 @@ jobs: package-rpm: needs: [should-run, build-test, generate-version] - if: ${{ needs.should-run.outputs.go == 'true' }} uses: ./.github/workflows/reusable-package.yml with: pkg_type: rpm diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index 1b99d60542..4f48bb2507 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -45,13 +45,16 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + with: + sparse-checkout: | + .github/actions/generate-version + src/libxrpl/protocol/BuildInfo.cpp - name: Generate version id: version uses: ./.github/actions/generate-version package-deb: needs: [build-test, generate-version] - if: ${{ github.repository == 'XRPLF/rippled' }} uses: ./.github/workflows/reusable-package.yml with: pkg_type: deb @@ -61,7 +64,6 @@ jobs: package-rpm: needs: [build-test, generate-version] - if: ${{ github.repository == 'XRPLF/rippled' }} uses: ./.github/workflows/reusable-package.yml with: pkg_type: rpm diff --git a/.github/workflows/on-trigger.yml b/.github/workflows/on-trigger.yml index bd018054e5..85c7eedb5b 100644 --- a/.github/workflows/on-trigger.yml +++ b/.github/workflows/on-trigger.yml @@ -108,6 +108,10 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + with: + sparse-checkout: | + .github/actions/generate-version + src/libxrpl/protocol/BuildInfo.cpp - name: Generate version id: version uses: ./.github/actions/generate-version diff --git a/.github/workflows/reusable-package.yml b/.github/workflows/reusable-package.yml index 821efabc54..b166f85ed7 100644 --- a/.github/workflows/reusable-package.yml +++ b/.github/workflows/reusable-package.yml @@ -4,16 +4,12 @@ name: Package on: workflow_call: inputs: - pkg_type: - description: "Package type to build: deb or rpm." - required: true - type: string artifact_name: - description: "Name of the pre-built binary artifact to download." + description: "Name of the GitHub pre-built binary artifact to download (e.g. xrpld-ubuntu-jammy-gcc-12-amd64-release)." required: true type: string - version: - description: "Version string used for naming the output artifact." + container_image: + description: "Container image to use for packaging." required: true type: string pkg_release: @@ -21,8 +17,12 @@ on: required: false type: string default: "1" - container_image: - description: "Container image to use for packaging." + pkg_type: + description: "Package type to build: deb or rpm." + required: true + type: string + version: + description: "Version string used for naming the output artifact." required: true type: string @@ -35,7 +35,7 @@ env: jobs: package: - name: ${{ inputs.pkg_type }} (${{ inputs.version }}) + name: "${{ inputs.pkg_type }} (${{ inputs.version }})" permissions: contents: read runs-on: ["self-hosted", "Linux", "X64", "heavy"] diff --git a/cmake/XrplPackaging.cmake b/cmake/XrplPackaging.cmake index ee407d1081..4d4ae4f15b 100644 --- a/cmake/XrplPackaging.cmake +++ b/cmake/XrplPackaging.cmake @@ -90,7 +90,8 @@ foreach(PKG deb rpm) --cgroupns host \ --volume '${CMAKE_SOURCE_DIR}:/root:ro' \ --volume /sys/fs/cgroup:/sys/fs/cgroup:rw \ - --tmpfs /tmp --tmpfs /run \ + --tmpfs /tmp \ + --tmpfs /run \ --tmpfs /run/lock \ ${IMAGE} \ /usr/sbin/init"