diff --git a/.github/workflows/reusable-upload-recipe.yml b/.github/workflows/reusable-upload-recipe.yml index 0511458e7f..ac0d69a497 100644 --- a/.github/workflows/reusable-upload-recipe.yml +++ b/.github/workflows/reusable-upload-recipe.yml @@ -68,33 +68,17 @@ jobs: run: conan remote login "${REMOTE_NAME}" "${CONAN_LOGIN_USERNAME_XRPLF}" --password "${CONAN_PASSWORD_XRPLF}" - name: Upload Conan recipe (version) + env: + VERSION: ${{ steps.release_info.outputs.version }} run: | - conan export . --version=${{ steps.release_info.outputs.version }} - conan upload --confirm --check --remote="${REMOTE_NAME}" xrpl/${{ steps.release_info.outputs.version }} + conan export . --version="${VERSION}" + conan upload --confirm --check --remote="${REMOTE_NAME}" "xrpl/${VERSION}" - # When this workflow is triggered by a push event, it will always be when merging into the - # 'develop' branch, see on-trigger.yml. - name: Upload Conan recipe (develop) - if: ${{ github.event_name == 'push' }} + if: ${{ github.ref == 'refs/heads/develop' }} run: | conan export . --version=develop conan upload --confirm --check --remote="${REMOTE_NAME}" xrpl/develop - # When this workflow is triggered by a pull request event, it will always be when merging into - # one of the 'release' branches, see on-pr.yml. - - name: Upload Conan recipe (rc) - if: ${{ github.event_name == 'pull_request' }} - run: | - conan export . --version=rc - conan upload --confirm --check --remote="${REMOTE_NAME}" xrpl/rc - - # When this workflow is triggered by a push event, it will always be when tagging a final - # release, see on-tag.yml. - - name: Upload Conan recipe (release) - if: ${{ startsWith(github.ref, 'refs/tags/') }} - run: | - conan export . --version=release - conan upload --confirm --check --remote="${REMOTE_NAME}" xrpl/release - outputs: ref: xrpl/${{ steps.release_info.outputs.version }}