Fix comment

.github/actions/generate-version/action.yml

@@ -0,0 +1,32 @@
+name: Generate build version number
+description: "Generate build version number."
+
+outputs:
+  version:
+    description: "The generated build version number."
+    value: ${{ steps.version.outputs.version }}
+
+runs:
+  using: composite
+  steps:
+    - name: Generate version
+      id: version
+      shell: bash
+      env:
+        # Only append the commit hash for the develop branch. For releases the
+        # version is used as-is. We will shorten it to 6 characters below.
+        COMMIT_HASH: ${{ github.ref == 'refs/heads/develop' && github.sha || '' }}
+      run: |
+        echo 'Extracting version from BuildInfo.cpp.'
+        VERSION="$(cat src/libxrpl/protocol/BuildInfo.cpp | grep "versionString =" | awk -F '"' '{print $2}')"
+        if [[ -z "${VERSION}" ]]; then
+          echo 'Unable to extract version from BuildInfo.cpp.'
+          exit 1
+        fi
+
+        if [[ -n "${COMMIT_HASH}" ]]; then
+          echo 'Appending shortened commit hash to version.'
+          VERSION="${VERSION}-${COMMIT_HASH:0:6}"
+        fi
+
+        echo "version=${VERSION}" >> "${GITHUB_OUTPUT}"

.github/actions/upload-recipe/action.yml

@@ -0,0 +1,46 @@
+name: Upload Conan recipe
+description: "Upload recipe to a Conan remote."
+
+inputs:
+  conan_recipe_ref:
+    description: "The Conan recipe reference ('name/version') to upload."
+    required: true
+  conan_remote_name:
+    description: "The name of the Conan remote to use."
+    required: true
+  conan_remote_url:
+    description: "The URL of the Conan endpoint to use."
+    required: true
+  conan_remote_username:
+    description: "The username for logging into the Conan remote."
+    required: true
+  conan_remote_password:
+    description: "The password for logging into the Conan remote."
+    required: true
+
+runs:
+  using: composite
+
+  steps:
+    - name: Set up Conan
+      uses: ./.github/actions/setup-conan
+      with:
+        conan_remote_name: ${{ inputs.conan_remote_name }}
+        conan_remote_url: ${{ inputs.conan_remote_url }}
+
+    - name: Log into Conan remote
+      shell: bash
+      env:
+        CONAN_REMOTE_NAME: ${{ inputs.conan_remote_name }}
+        CONAN_REMOTE_USERNAME: ${{ inputs.conan_remote_username }}
+        CONAN_REMOTE_PASSWORD: ${{ inputs.conan_remote_password }}
+      run: conan remote login "${CONAN_REMOTE_NAME}" "${CONAN_REMOTE_USERNAME}" --password "${CONAN_REMOTE_PASSWORD}"
+
+    - name: Upload Conan recipe
+      shell: bash
+      env:
+        CONAN_RECIPE_REF: ${{ inputs.conan_recipe_ref }}
+        CONAN_REMOTE_NAME: ${{ inputs.conan_remote_name }}
+      run: |
+        conan export .
+        conan upload --confirm --check --remote="${CONAN_REMOTE_NAME}" ${CONAN_RECIPE_REF}

.github/workflows/on-pr.yml

@@ -53,7 +53,6 @@ jobs:
             .github/scripts/rename/**
             .github/workflows/reusable-check-levelization.yml
             .github/workflows/reusable-check-rename.yml
-            .github/workflows/reusable-notify-clio.yml
             .github/workflows/on-pr.yml
 
             # Keep the paths below in sync with those in `on-trigger.yml`.
@@ -66,6 +65,7 @@ jobs:
             .github/workflows/reusable-build-test.yml
             .github/workflows/reusable-strategy-matrix.yml
             .github/workflows/reusable-test.yml
+            .github/workflows/reusable-upload-recipe.yml
             .codecov.yml
             cmake/**
             conan/**
@@ -121,12 +121,15 @@ jobs:
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
-  notify-clio:
+  upload-recipe:
     needs:
       - should-run
       - build-test
-    if: ${{ needs.should-run.outputs.go == 'true' && startsWith(github.ref, 'refs/heads/release') }}
+    # Only run when committing to the release branch in the XRPLF repository. We
-    uses: ./.github/workflows/reusable-notify-clio.yml
+    # also upload the recipe when merging into the develop branch, but that is
+    # handled in the on-trigger.yml workflow.
+    if: ${{ github.repository_owner == 'XRPLF' && needs.should-run.outputs.go == 'true' && startsWith(github.ref, 'refs/heads/release') }}
+    uses: ./.github/workflows/reusable-upload-recipe.yml
     secrets:
       clio_notify_token: ${{ secrets.CLIO_NOTIFY_TOKEN }}
       conan_remote_username: ${{ secrets.CONAN_REMOTE_USERNAME }}
@@ -137,6 +140,7 @@ jobs:
     needs:
       - build-test
       - check-levelization
+      - upload-recipe
     runs-on: ubuntu-latest
     steps:
       - name: Fail

.github/workflows/on-trigger.yml

@@ -24,6 +24,7 @@ on:
       - ".github/workflows/reusable-build-test.yml"
       - ".github/workflows/reusable-strategy-matrix.yml"
       - ".github/workflows/reusable-test.yml"
+      - ".github/workflows/reusable-upload-recipe.yml"
       - ".codecov.yml"
       - "cmake/**"
       - "conan/**"
@@ -76,3 +77,14 @@ jobs:
       strategy_matrix: ${{ github.event_name == 'schedule' && 'all' || 'minimal' }}
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
+  upload-recipe:
+    needs: build-test
+    # Only run when pushing to the develop branch in the XRPLF repository. We
+    # also upload the recipe when committing to a release branch, but that is
+    # handled in the on-pr.yml workflow.
+    if: ${{ github.repository_owner == 'XRPLF' && github.event_name == 'push' && github.ref == 'refs/heads/develop' }}
+    uses: ./.github/workflows/reusable-upload-recipe.yml
+    secrets:
+      conan_remote_username: ${{ secrets.CONAN_REMOTE_USERNAME }}
+      conan_remote_password: ${{ secrets.CONAN_REMOTE_PASSWORD }}

.github/workflows/reusable-upload-recipe.yml

@@ -1,7 +1,7 @@
-# This workflow exports the built libxrpl package to the Conan remote on a
+# This workflow exports the built libxrpl package to the Conan remote, and for
-# a channel named after the pull request, and notifies the Clio repository about
+# releases also notifies the Clio repository about the new version, so it can
-# the new version so it can check for compatibility.
+# check for compatibility.
-name: Notify Clio
+name: Upload Conan recipe
 
 # This workflow can only be triggered by other workflows.
 on:
@@ -20,7 +20,7 @@ on:
     secrets:
       clio_notify_token:
         description: "The GitHub token to notify Clio about new versions."
-        required: true
+        required: false
       conan_remote_username:
         description: "The username for logging into the Conan remote."
         required: true
@@ -29,7 +29,7 @@ on:
         required: true
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-clio
+  group: ${{ github.workflow }}-${{ github.ref }}-upload-recipe
   cancel-in-progress: true
 
 defaults:
@@ -38,46 +38,35 @@ defaults:
 
 jobs:
   upload:
-    if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
     runs-on: ubuntu-latest
     container: ghcr.io/xrplf/ci/ubuntu-noble:gcc-13-sha-5dd7158
     steps:
       - name: Checkout repository
         uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
-      - name: Generate outputs
+
-        id: generate
+      - name: Generate build version number
-        env:
+        id: version
-          PR_NUMBER: ${{ github.event.pull_request.number }}
+        uses: ./.github/actions/generate-version
-        run: |
+
-          echo 'Generating user and channel.'
+      - name: Determine recipe reference
-          echo "user=clio" >> "${GITHUB_OUTPUT}"
+        id: ref
-          echo "channel=pr_${PR_NUMBER}" >> "${GITHUB_OUTPUT}"
+        run: echo "ref=xrpl/${{ steps.version.outputs.version }}" >> "${GITHUB_OUTPUT}"
-          echo 'Extracting version.'
+
-          echo "version=$(cat src/libxrpl/protocol/BuildInfo.cpp | grep "versionString =" | awk -F '"' '{print $2}')" >> "${GITHUB_OUTPUT}"
+      - name: Upload recipe
-      - name: Calculate conan reference
+        uses: ./.github/actions/upload-recipe
-        id: conan_ref
+        id: upload
-        run: |
-          echo "conan_ref=${{ steps.generate.outputs.version }}@${{ steps.generate.outputs.user }}/${{ steps.generate.outputs.channel }}" >> "${GITHUB_OUTPUT}"
-      - name: Set up Conan
-        uses: ./.github/actions/setup-conan
         with:
+          conan_recipe_ref: ${{ steps.version.outputs.version }}
           conan_remote_name: ${{ inputs.conan_remote_name }}
           conan_remote_url: ${{ inputs.conan_remote_url }}
-      - name: Log into Conan remote
+          conan_remote_username: ${{ secrets.conan_remote_username }}
-        env:
+          conan_remote_password: ${{ secrets.conan_remote_password }}
-          CONAN_REMOTE_NAME: ${{ inputs.conan_remote_name }}
-        run: conan remote login "${CONAN_REMOTE_NAME}" "${{ secrets.conan_remote_username }}" --password "${{ secrets.conan_remote_password }}"
-      - name: Upload package
-        env:
-          CONAN_REMOTE_NAME: ${{ inputs.conan_remote_name }}
-        run: |
-          conan export --user=${{ steps.generate.outputs.user }} --channel=${{ steps.generate.outputs.channel }} .
-          conan upload --confirm --check --remote="${CONAN_REMOTE_NAME}" xrpl/${{ steps.conan_ref.outputs.conan_ref }}
     outputs:
-      conan_ref: ${{ steps.conan_ref.outputs.conan_ref }}
+      conan_ref: ${{ steps.ref.outputs.ref }}
 
   notify:
     needs: upload
+    if: ${{ github.event_name == 'pull_request' }}
     runs-on: ubuntu-latest
     steps:
       - name: Notify Clio