From 1b5f22aac2f153fa6893272f25f3fc00bfe6c5b7 Mon Sep 17 00:00:00 2001
From: Jerome Laban <jerome.laban@nventive.com>
Date: Sun, 18 Oct 2020 18:40:34 -0400
Subject: [PATCH] ci: Include version in appimage recipe

---
 .vsts-ci.Skia.yml                       | 20 ++++++++++++++++++++
 build/appimage/AppImageBuilder.x64.yaml |  4 +++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/.vsts-ci.Skia.yml b/.vsts-ci.Skia.yml
index a95c5ba9d..7e43c25f5 100644
--- a/.vsts-ci.Skia.yml
+++ b/.vsts-ci.Skia.yml
@@ -357,6 +357,23 @@ jobs:
     options: "--name ci-container -v /usr/bin/docker:/tmp/docker:ro"
 
   steps:
+  - task: UseDotNet@2
+    displayName: 'Use .Net Core runtime 3.1.x'
+    inputs:
+      packageType: sdk
+      version: '3.1.x'
+
+  - task: gitversion/setup@0
+    inputs:
+      versionSpec: '5.x'
+
+  - task: gitversion/execute@0
+    inputs:
+      updateAssemblyInfo: 'False'
+      useConfigFile: true
+      configFilePath: gitversion.yml
+    displayName: Use GitVersion
+
   - task: DownloadBuildArtifacts@0
     inputs:
       artifactName: Calculator
@@ -378,6 +395,9 @@ jobs:
         appimage-builder --recipe AppImageBuilder.x64.yaml --skip-test
         cp *.AppImage $(build.artifactstagingdirectory)
 
+    env:
+      GITVERSION_FullSemVer: $(GitVersion.FullSemVer)
+
   - task: PublishBuildArtifacts@1
     displayName: Publish Package Artifacts
     inputs:
diff --git a/build/appimage/AppImageBuilder.x64.yaml b/build/appimage/AppImageBuilder.x64.yaml
index f651e756f..396ed239b 100644
--- a/build/appimage/AppImageBuilder.x64.yaml
+++ b/build/appimage/AppImageBuilder.x64.yaml
@@ -5,7 +5,7 @@ AppDir:
     id: uno.platform.calculator
     name: uno-calculator
     icon: 'StoreLogo'
-    version: latest
+    version: !ENV ${GITVERSION_FullSemVer}
     exec: usr/bin/uno-calculator/Calculator.Skia.Gtk
     exec_args: $@
   runtime:
@@ -73,7 +73,9 @@ AppDir:
       image: appimagecrafters/tests-env:ubuntu-xenial
       command: ./AppRun
       use_host_x: true
+
 AppImage:
   arch: x86_64
+  file_name: !ENV uno-calculator-${GITVERSION_FullSemVer}-x86_64.AppImage
   update-information: None
   sign-key: None