From ee5dfe7ebc78bad57be4bcf040879fe7d2a4c0ef Mon Sep 17 00:00:00 2001 From: Edie Lemoine Date: Mon, 23 Oct 2023 11:26:26 +0200 Subject: [PATCH] build(gha): update workflows --- .github/workflows/push.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 74c7f977..b8341edf 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -17,8 +17,6 @@ jobs: build: runs-on: ubuntu-22.04 - needs: - - test steps: - uses: actions/checkout@v3 with: @@ -34,18 +32,20 @@ jobs: #language=sh run: | version=$(npm pkg get version | sed 's/"//g') - releaseVersion="$version-${{ github.sha }}" + commitsSinceTag=$(git log --oneline v$version.. | wc -l) + releaseVersion="$version-$commitsSinceTag" echo "version=$releaseVersion" >> $GITHUB_OUTPUT - uses: ./.github/actions/release id: release with: - image: ${{ steps.build.outputs.image }} version: ${{ steps.version.outputs.version }} + image: ${{ steps.build.outputs.image }} rebase-prs: needs: - test + - build uses: ./.github/workflows/rebase-prs.yml secrets: inherit