Merge pull request #14 from reecetech/fix-git-fetch-tags-issue

[DE-4875] Forcing git fetch tags

README.md

@@ -9,7 +9,7 @@
         uses: actions/checkout@v2
 
       - name: Get next version
-        uses: reecetech/version-increment@2021.10.4
+        uses: reecetech/version-increment@2022.2.4
         id: version
         with:
           scheme: semver
@@ -84,8 +84,16 @@ Examples:
 
 | name              | description                                                                                       |
 | :---              | :---                                                                                              |
-| current_version | The current latest version detected from the git repositories tags |
+| current-version   | The current latest version detected from the git repositories tags                                |
+| current-v-version | The current latest version detected from the git repositories tags, prefixed with a `v` character |
 | version           | The incremented version number (e.g. the next version)                                            |
+| v-version         | The incremented version number (e.g. the next version), prefixed with a `v` character             |
+| major-version     | Major number of the incremented version                                                           |
+| minor-version     | Minor number of the incremented version                                                           |
+| patch-version     | Patch number of the incremented version                                                           |
+| major-v-version   | Major number of the incremented version, prefixed with a `v` character                            |
+| minor-v-version   | Minor number of the incremented version, prefixed with a `v` character                            |
+| patch-v-version   | Patch number of the incremented version, prefixed with a `v` character                            |
 
 ## 💕 Contributing
 

action.yml

@@ -20,12 +20,36 @@ inputs:
     default: 'patch'
 
 outputs:
-  current_version:
+  current-version:
     description: 'Current normal version detected'
     value: ${{ steps.version-lookup.outputs.current-version }}
+  current-v-version:
+    description: 'Current normal version detected, prefixed with a `v` charatcter'
+    value: ${{ steps.version-lookup.outputs.current-v-version }}
   version:
     description: 'Incremented version calculated'
     value: ${{ steps.version-increment.outputs.version }}
+  v-version:
+    description: 'Incremented version calculated, prefixed with a `v` charatcter'
+    value: ${{ steps.version-increment.outputs.v-version }}  
+  major-version:
+    description: 'Major number of the incremented version'
+    value: ${{ steps.version-increment.outputs.major-version }}
+  minor-version:
+    description: 'Minor number of the incremented version'
+    value: ${{ steps.version-increment.outputs.minor-version }}
+  patch-version:
+    description: 'Patch number of the incremented version'
+    value: ${{ steps.version-increment.outputs.patch-version }}
+  major-v-version:
+    description: 'Major number of the incremented version, prefixed with a `v` charatcter'
+    value: ${{ steps.version-increment.outputs.major-v-version }}
+  minor-v-version:
+    description: 'Minor number of the incremented version, prefixed with a `v` charatcter'
+    value: ${{ steps.version-increment.outputs.minor-v-version }}
+  patch-v-version:
+    description: 'Patch number of the incremented version, prefixed with a `v` charatcter'
+    value: ${{ steps.version-increment.outputs.patch-v-version }}
 
 runs:
   using: "composite"

tests/test_version-increment.bats

@@ -75,6 +75,9 @@ function init_repo {
 
     print_run_info
     [ "$status" -eq 0 ] &&
+    [[ "$output" = *"::set-output name=major-version::1"* ]] &&
+    [[ "$output" = *"::set-output name=minor-version::2"* ]] &&
+    [[ "$output" = *"::set-output name=patch-version::4"* ]] &&
     [[ "$output" = *"::set-output name=version::1.2.4"* ]]
 }
 
@@ -88,6 +91,9 @@ function init_repo {
 
     print_run_info
     [ "$status" -eq 0 ] &&
+    [[ "$output" = *"::set-output name=major-version::1"* ]] &&
+    [[ "$output" = *"::set-output name=minor-version::3"* ]] &&
+    [[ "$output" = *"::set-output name=patch-version::0"* ]] &&
     [[ "$output" = *"::set-output name=version::1.3.0"* ]]
 }
 
@@ -101,9 +107,29 @@ function init_repo {
 
     print_run_info
     [ "$status" -eq 0 ] &&
+    [[ "$output" = *"::set-output name=major-version::2"* ]] &&
+    [[ "$output" = *"::set-output name=minor-version::0"* ]] &&
+    [[ "$output" = *"::set-output name=patch-version::0"* ]] &&
     [[ "$output" = *"::set-output name=version::2.0.0"* ]]
 }
 
+@test "prefixes with v" {
+    init_repo
+
+    export current_version=1.2.3
+    export increment="major"
+
+    run ../../version-increment.sh
+
+    print_run_info
+    [ "$status" -eq 0 ] &&
+    [[ "$output" = *"::set-output name=version::2.0.0"* ]] &&
+    [[ "$output" = *"::set-output name=major-v-version::v2"* ]] &&
+    [[ "$output" = *"::set-output name=minor-v-version::v0"* ]] &&
+    [[ "$output" = *"::set-output name=patch-v-version::v0"* ]] &&
+    [[ "$output" = *"::set-output name=v-version::v2.0.0"* ]]
+}
+
 @test "increments to a new month (calver)" {
     init_repo
 

tests/test_version-lookup.bats

@@ -43,6 +43,19 @@ function init_repo {
     [[ "$output" = *"::set-output name=current-version::0.1.2"* ]]
 }
 
+@test "prefixes with a v" {
+    init_repo
+
+    git tag 0.1.2
+
+    run ../../version-lookup.sh
+
+    print_run_info
+    [ "$status" -eq 0 ] &&
+    [[ "$output" = *"::set-output name=current-version::0.1.2"* ]] &&
+    [[ "$output" = *"::set-output name=current-v-version::v0.1.2"* ]]
+}
+
 @test "finds the current normal version even if there's a newer pre-release version" {
     init_repo
 

version-increment.sh

@@ -87,3 +87,10 @@ fi
 echo "ℹ️ The new version is ${new_version}"
 
 echo "::set-output name=version::${new_version}"
+echo "::set-output name=v-version::v${new_version}"
+echo "::set-output name=major-version::${version_array[0]}"
+echo "::set-output name=minor-version::${version_array[1]}"
+echo "::set-output name=patch-version::${version_array[2]}"
+echo "::set-output name=major-v-version::v${version_array[0]}"
+echo "::set-output name=minor-v-version::v${version_array[1]}"
+echo "::set-output name=patch-v-version::v${version_array[2]}"

version-lookup.sh

@@ -27,18 +27,18 @@ fi
 
 # Skip if testing, otherwise pull tags
 if [[ -z "${BATS_VERSION:-}" ]] ; then
-    git fetch --quiet origin 'refs/tags/*:refs/tags/*'
+    git fetch --quiet --force origin 'refs/tags/*:refs/tags/*'
 fi
 
 ##==----------------------------------------------------------------------------
 ##  Version parsing
 
 # detect current version - removing "v" from start of tag if it exists
-current_version="$(git tag -l | { ${grep} -P "${pcre_allow_vprefix}" || true; } | sed 's/^v//g' | sort -V --reverse | head -n1)"
+current_version="$(git tag -l | { ${grep} -P "${pcre_allow_vprefix}" || true; } | sed 's/^v//g' | sort -V | tail -n 1)"
 
 # support transition from an old reecetech calver style (yyyy-mm-Rr, where R is the literal `R`, and r is the nth release for the month)
 if [[ -z "${current_version:-}" ]] ; then
-    current_version="$(git tag -l | { ${grep} -P "${pcre_old_calver}" || true; } | sort -V --reverse | head -n1)"
+    current_version="$(git tag -l | { ${grep} -P "${pcre_old_calver}" || true; } | sort -V | tail -n 1)"
     if [[ -n "${current_version:-}" ]] ; then
         # convert - to . and drop leading zeros & the R
         current_version="$(echo "${current_version}" | sed -r 's/^([0-9]+)-0{0,1}([0-9]+)-R0{0,1}([0-9]+)$/\1.\2.\3/')"
@@ -62,3 +62,4 @@ fi
 echo "ℹ️ The current normal version is ${current_version}"
 
 echo "::set-output name=current-version::${current_version}"
+echo "::set-output name=current-v-version::v${current_version}"