From de0c21d065996aaf78d1880ae68e2f5ff5ec2a11 Mon Sep 17 00:00:00 2001 From: "Celina G. Val" Date: Thu, 26 Oct 2023 10:52:35 -0700 Subject: [PATCH] Fix build bundle tag check --- .github/actions/build-bundle/action.yml | 13 +++++++------ .github/workflows/release.yml | 1 - 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/actions/build-bundle/action.yml b/.github/actions/build-bundle/action.yml index 5db3b50e7158..8ecefd545e22 100644 --- a/.github/actions/build-bundle/action.yml +++ b/.github/actions/build-bundle/action.yml @@ -30,23 +30,24 @@ runs: - name: Export tag version shell: bash - if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }} + if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/kani-') }} run: | - echo "VERSION=${TAG_VERSION}" >> $GITHUB_ENV + # GITHUB_REF is refs/tags/kani-0.1.0 + echo "VERSION=$(echo ${{ github.ref }} | cut -d "-" -f 2)" >> $GITHUB_ENV - name: Check Version shell: bash - if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }} + if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/kani-') }} run: | # Validate git tag & Cargo.toml are in sync on version number - if [[ ${{ env.CRATE_VERSION }} != ${{ env.TAG_VERSION }} ]]; then - echo "Git tag ${{env.TAG_VERSION}} did not match crate version ${{env.CRATE_VERSION}}" + if [[ ${{ env.CRATE_VERSION }} != ${{ env.VERSION }} ]]; then + echo "Git tag ${{env.VERSION}} did not match crate version ${{env.CRATE_VERSION}}" exit 1 fi - name: Export latest version shell: bash - if: ${{ !startsWith(github.ref, 'refs/tags/v') }} + if: ${{ !startsWith(github.ref, 'refs/tags/kani-') }} run: | echo "VERSION=latest" >> $GITHUB_ENV diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ff38f7417cc9..b487fe389e64 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -145,7 +145,6 @@ jobs: # For now, we only test for Ubuntu-18.04 so we don't bother using matrix to configure the platform. test_alt_platform: name: TestAlternativePlatforms - if: ${{ github.event_name == 'push' }} needs: [build_bundle_linux] runs-on: ubuntu-22.04 env: