From 37674202888789ede81e47fa75b24bc40cbd4c7f Mon Sep 17 00:00:00 2001 From: Siddharth Chandrasekaran Date: Sat, 9 Mar 2024 11:12:51 +0100 Subject: [PATCH] ci: Fix tag name when published from UI Signed-off-by: Siddharth Chandrasekaran --- .github/workflows/publish-crate.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-crate.yml b/.github/workflows/publish-crate.yml index 68d887b..a89ba2a 100644 --- a/.github/workflows/publish-crate.yml +++ b/.github/workflows/publish-crate.yml @@ -14,7 +14,7 @@ on: - 'osdpctl-v*' workflow_dispatch: inputs: - tags: + tag: description: 'Tag' required: true @@ -30,7 +30,18 @@ jobs: with: toolchain: stable override: true - - run: cargo publish --token ${CRATES_TOKEN} -p $(echo ${REL_TAG} | perl -pe 's/([a-z\-]+)-v.*/\1/') + - name: "Setup environment - trigger" + if: github.ref == 'refs/heads/master' + run: echo "TAG=${TRIGGER_TAG}" >> "${GITHUB_ENV}" + env: + TRIGGER_TAG: ${{ github.event.inputs.tag }} + - name: "Setup environment - tag" + if: github.ref != 'refs/heads/master' + run: echo "TAG=${REL_TAG}" >> "${GITHUB_ENV}" env: - CRATES_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} REL_TAG: ${{ github.ref_name }} + - name: "Publish crate" + run: | + cargo publish --token ${CRATES_TOKEN} -p $(echo ${TAG} | perl -pe 's/([a-z\-]+)-v.*/\1/') + env: + CRATES_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}