diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 37db013..57636c4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,7 +6,7 @@ jobs: name: Test Linux steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: GitVersion id: v uses: ./ # This repo action @@ -22,7 +22,7 @@ jobs: name: Test Windows steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: GitVersion id: v uses: ./ # This repo action diff --git a/README.md b/README.md index 1fd5c6b..9863ed4 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,11 @@ jobs: ShortVersion: ${{ steps.gitversion.outputs.ShortVersion }} LongVersion: ${{ steps.gitversion.outputs.LongVersion }} GitVersion: ${{ steps.gitversion.outputs.GitVersion }} + GitVersionPrerelease: ${{ steps.gitversion.outputs.GitVersionPrerelease }} steps: - name: GitVersion id: gitversion - uses: opentap/get-gitversion@v1.0 + uses: opentap/get-gitversion@v1.2 ``` You can then use the version in a job like this: diff --git a/action.yml b/action.yml index 04c1ffb..dcc8948 100644 --- a/action.yml +++ b/action.yml @@ -42,7 +42,7 @@ runs: - name: Prerelease shell: bash id: prereleaseVer - run: echo "VER=`tap sdk gitversion | sed -n 's/.*-\([^+]*\).*/\1/p'`" >> $GITHUB_OUTPUT + run: echo "VER=`tap sdk gitversion | sed -n 's/[^-]*-\([^+]*\).*/\1/p'`" >> $GITHUB_OUTPUT - name: Print Version shell: bash run: echo `tap sdk gitversion`