Merge pull request #316 from unoplatform/dev/jela/skia-arm

Update arm snap

Author: jeromelaban

.vsts-ci.Skia.yml

@@ -244,7 +244,6 @@ jobs:
 - job: macOS_Snap
   dependsOn:
     - Linux_Skia_x86
-    - Linux_Skia_ARM
   pool:
     vmImage: 'macOS-10.15'
 
@@ -276,3 +275,72 @@ jobs:
       pathToPublish: $(build.artifactstagingdirectory)
       artifactType: container
       artifactName: Calculator
+
+- job: ARM64_Snap
+  dependsOn:
+    - Linux_Skia_ARM
+
+  container: unoplatform/snapcraft:20201014-arm64
+  pool: 'Linux-Arm64-20.04'
+
+  steps:
+  - task: DownloadBuildArtifacts@0
+    inputs:
+      artifactName: Calculator
+      downloadPath: '$(build.sourcesdirectory)/build'
+
+  - script: |
+        cd $(build.sourcesdirectory)/build
+        snapcraft
+        
+  - task: CopyFiles@2
+    displayName: 'Publish Snap'
+    inputs:
+      SourceFolder: $(build.sourcesdirectory)/build
+      Contents: '**/*.snap'
+      TargetFolder: $(build.artifactstagingdirectory)/skia
+      CleanTargetFolder: false
+      OverWrite: false
+      flattenFolders: false
+
+  - task: PublishBuildArtifacts@1
+    displayName: Publish Package Artifacts
+    inputs:
+      pathToPublish: $(build.artifactstagingdirectory)
+      artifactType: container
+      artifactName: Calculator
+
+# armhf is not supported by azuredevops
+# - job: ARMHF_Snap
+#   dependsOn:
+#     - Linux_Skia_ARM
+# 
+#   container: unoplatform/snapcraft:20201014-armhf
+#   pool: 'Linux-Arm64-20.04'
+# 
+#   steps:
+#   - task: DownloadBuildArtifacts@0
+#     inputs:
+#       artifactName: Calculator
+#       downloadPath: '$(build.sourcesdirectory)/build'
+# 
+#   - script: |
+#         cd $(build.sourcesdirectory)/build
+#         snapcraft
+#         
+#   - task: CopyFiles@2
+#     displayName: 'Publish Snap'
+#     inputs:
+#       SourceFolder: $(build.sourcesdirectory)/build
+#       Contents: '**/*.snap'
+#       TargetFolder: $(build.artifactstagingdirectory)/skia
+#       CleanTargetFolder: false
+#       OverWrite: false
+#       flattenFolders: false
+# 
+#   - task: PublishBuildArtifacts@1
+#     displayName: Publish Package Artifacts
+#     inputs:
+#       pathToPublish: $(build.artifactstagingdirectory)
+#       artifactType: container
+#       artifactName: Calculator

build/snap/snapcraft.yaml

@@ -19,6 +19,11 @@ architectures:
 parts:
   uno-calculator:
     plugin: dump
+    stage-packages:
+      - libfontconfig1
+      - libfreetype6
+      - libpng16-16
+
     source: 
       - on amd64: Calculator/skia/Calculator-linux-x64.zip
       - on arm64: Calculator/skia/Calculator-linux-arm64.zip