diff --git a/.github/workflows/calculate-tag.yaml b/.github/workflows/calculate-tag.yaml index 092000b2f..033bd5b27 100644 --- a/.github/workflows/calculate-tag.yaml +++ b/.github/workflows/calculate-tag.yaml @@ -23,21 +23,21 @@ jobs: outputs: tag: "${{ steps.tag.outputs.tag }}" steps: - - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0 + - uses: actions/checkout@v3 with: fetch-depth: 0 - - - name: Determine latest upstream release tag + - name: Get the tag name + if: contains(github.ref, 'refs/tags/') id: latest_tag - if: "!contains(github.ref,'refs/tags/')" run: | - latest_tag=$(git describe --abbrev=0 --tags) + latest_tag="" + echo "latest_tag=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT + if [[ "${{ github.ref_type }}" = "tag" ]]; then + latest_tag="${GITHUB_REF#refs/tags/}" + else + latest_tag=$(git describe --abbrev=0 --tags) + fi echo "latest_tag=$latest_tag" >> $GITHUB_OUTPUT - - name: Get the tag name - if: contains(github.ref, 'refs/tags/') - id: tag_name - run: echo "latest_tag=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT - - name: Calculate pre-release suffix id: tag-suffix run: | diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c23d3ab1b..f7ea2dded 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -35,6 +35,7 @@ jobs: run: make crossbuild - name: Package run: make crossbuild-tarballs + - run: ls -latr - name: Archive artifacts uses: actions/upload-artifact@v3 with: