From deba938eeff98ba114ab024fb02cd1eee60400e3 Mon Sep 17 00:00:00 2001 From: Michael Legleux Date: Tue, 31 Mar 2026 12:35:01 -0700 Subject: [PATCH] pr comments --- .github/workflows/manual-package.yml | 62 ---------------------------- package/shared/update-xrpld.sh | 2 +- 2 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 .github/workflows/manual-package.yml diff --git a/.github/workflows/manual-package.yml b/.github/workflows/manual-package.yml deleted file mode 100644 index e552f8cadf..0000000000 --- a/.github/workflows/manual-package.yml +++ /dev/null @@ -1,62 +0,0 @@ -name: Manual Package Build - -on: - workflow_dispatch: - inputs: - pkg_type: - description: "Package type" - required: true - type: choice - options: - - deb - - rpm - - both - version: - description: "Version override (leave empty to auto-detect)" - required: false - type: string - pkg_release: - description: "Package release number (default: 1)" - required: false - type: string - default: "1" - -defaults: - run: - shell: bash - -jobs: - generate-version: - runs-on: ubuntu-latest - outputs: - version: ${{ inputs.version || steps.version.outputs.version }} - steps: - - name: Checkout repository - if: ${{ !inputs.version }} - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - - name: Generate version - if: ${{ !inputs.version }} - id: version - uses: ./.github/actions/generate-version - - package-deb: - if: ${{ inputs.pkg_type == 'deb' || inputs.pkg_type == 'both' }} - needs: generate-version - uses: ./.github/workflows/reusable-package.yml - with: - pkg_type: deb - artifact_name: xrpld-ubuntu-jammy-gcc-12-amd64-release - version: ${{ needs.generate-version.outputs.version }} - pkg_release: ${{ inputs.pkg_release }} - container_image: ghcr.io/xrplf/ci/ubuntu-jammy:gcc-12 - - package-rpm: - if: ${{ inputs.pkg_type == 'rpm' || inputs.pkg_type == 'both' }} - needs: generate-version - uses: ./.github/workflows/reusable-package.yml - with: - pkg_type: rpm - artifact_name: xrpld-rhel-9-gcc-12-amd64-release - version: ${{ needs.generate-version.outputs.version }} - pkg_release: ${{ inputs.pkg_release }} - container_image: ghcr.io/xrplf/ci/rhel-9:gcc-12 diff --git a/package/shared/update-xrpld.sh b/package/shared/update-xrpld.sh index 80bed1b18e..83773614eb 100755 --- a/package/shared/update-xrpld.sh +++ b/package/shared/update-xrpld.sh @@ -36,7 +36,7 @@ if command -v apt-get &>/dev/null; then DEBIAN_FRONTEND=noninteractive apt-get install -y -qq xrpld } elif command -v yum &>/dev/null; then - REPO=${REPO-stable} + REPO=${REPO:-stable} if [[ ! "$REPO" =~ ^(stable|unstable|nightly|develop)$ ]]; then echo "Invalid REPO value: ${REPO}" >&2 exit 1