Use GitVersion to increment build numbers

.github/workflows/deployment.yml

@@ -42,6 +42,18 @@ jobs:
          ref=${ref%/merge}
          echo "##[set-output name=branch;]${ref}"
       id: extract_branch
+    - name: Reattach head, fetch tags and master for GitVersion
+      run: |
+          git checkout "${{ steps.extract_branch.outputs.branch }}"
+          git branch --create-reflog master origin/master
+          git fetch --tags origin
+    - name: Install GitVersion
+      uses: gittools/actions/setup-gitversion@v0.3
+      with:
+          versionSpec: '5.1.x'
+    - name: Run GitVersion
+      id: gitversion
+      uses: gittools/actions/execute-gitversion@v0.3
     - name: Set up JDK
       uses: actions/setup-java@v1
       with:
@@ -77,11 +89,11 @@ jobs:
           zip.close()
       shell: python
     - name: Build runtime image
-      run: ./gradlew -Pdev=true jlinkZip
+      run: ./gradlew -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jlinkZip
     - name: Build installer
       run: |
         export BADASS_JLINK_JPACKAGE_HOME="${GITHUB_WORKSPACE}${{ matrix.jdk14Path }}"
-        ./gradlew -Pdev=true jpackage
+        ./gradlew -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jpackage
       shell: bash
     - name: Add installer as artifact
       uses: actions/upload-artifact@master
@@ -99,6 +111,11 @@ jobs:
           mkdir .snapcraft && echo ${SNAPCRAFT_LOGIN_FILE} | base64 --decode --ignore-garbage > .snapcraft/snapcraft.cfg
           docker run -v $(pwd):$(pwd) -t lyzardking/snapcraft-bionic sh -c "apt update -qq && cd $(pwd) && snapcraft && mv jabref*.snap build/distribution/ && snapcraft push build/distribution/jabref*.snap --release edge || true"
       shell: bash
+    - name: Rename files
+      run: |
+        get-childitem -Path build/distribution/* | rename-item -NewName {$_.name -replace "${{ steps.gitversion.outputs.AssemblySemVer }}","${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}"}
+        get-childitem -Path build/distribution/* | rename-item -NewName {$_.name -replace "portable","${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-portable"}
+      shell: pwsh
     - name: Upload to builds.jabref.org
       uses: garygrossgarten/github-action-scp@release
       with:

GitVersion.yml

@@ -0,0 +1,2 @@
+assembly-versioning-format: '{major}.{minor}.{buildmetadata}'
+assembly-informational-format: '{major}.{minor}{PreReleaseTagWithDash}'

build.gradle

@@ -41,7 +41,7 @@ apply plugin: LocalizationPlugin
 apply from: 'eclipse.gradle'
 
 group = "org.jabref"
-version = "5.0.0"
+version = project.findProperty('projVersion') ?: '0.0.1'
 
 sourceCompatibility = 13
 targetCompatibility = 13
@@ -280,7 +280,7 @@ processResources {
     filteringCharset = 'UTF-8'
 
     filesMatching("build.properties") {
-        expand(version: createVersionString(),
+        expand(version: project.findProperty('projVersionInfo') ?: '0.0.1',
                 "year": String.valueOf(Calendar.getInstance().get(Calendar.YEAR)),
                 "authors": new File('AUTHORS').readLines().findAll { !it.startsWith("#") }.join(", "),
                 "developers": new File('DEVELOPERS').readLines().findAll { !it.startsWith("#") }.join(", "),
@@ -716,35 +716,3 @@ task bundleLibreOffice(type: Jar) {
     destinationDir = file('lib')
     archiveName = 'libreoffice.jar'
 }
-
-// Returns the value of project.version in production and a string of the format VERSION-dev--DATE--BRANCH--GIT_HASH for development versions
-def createVersionString() {
-    if (hasProperty('dev')) {
-        String command = "git log --pretty=format:%cd--%h -n 1 --date=short"
-        String commitInfo
-        if (OperatingSystem.current().isWindows()) {
-            commitInfo = "cmd /c $command".execute().in.text
-        } else {
-            commitInfo = command.execute().in.text
-        }
-
-        // determine branch
-        command = "git symbolic-ref -q --short HEAD"
-        String branchName
-        if (OperatingSystem.current().isWindows()) {
-            branchName = "cmd /c $command".execute().in.text
-        } else {
-            branchName = command.execute().in.text
-        }
-        // A newline is returned. Remove it. (trim())
-        // In the context of github, the branch name could be something like "pull/277"
-        // "/" is an illegal character. To be safe, all illegal filename characters are replaced by "_"
-        // http://stackoverflow.com/a/15075907/873282 describes the used pattern.
-        branchName = branchName.trim().replaceAll("[^a-zA-Z0-9.-]", "_")
-
-        // first the date (%cd), then the branch name, and finally the commit id (%h)
-        return project.version + "-dev--" + commitInfo.substring(0, 10) + "--" + branchName + "--" + commitInfo.substring(12)
-    } else {
-        return project.version
-    }
-}