Merge branch 'next'

Author: Christopher - Marcel Böddecker

CHANGELOG.md

@@ -11,6 +11,17 @@
 
 * **templates:** changelog/release note formatting ([c8a7ee9](https://github.com/ExtendRealityLtd/DevOps/commit/c8a7ee9444849950903823b6b8708dcbae43744e))
 
+## [3.10.0-next.1](https://github.com/ExtendRealityLtd/DevOps/compare/v3.9.0...v3.10.0-next.1) (2019-10-14)
+
+#### Features
+
+* **templates:** merge commit messages in changelog/release note ([53371ac](https://github.com/ExtendRealityLtd/DevOps/commit/53371ace542626dce2f1124b3d468376a7fde5ae))
+  > This keeps paragraphs in the messages as is.
+
+#### Bug Fixes
+
+* **templates:** changelog/release note formatting ([c8a7ee9](https://github.com/ExtendRealityLtd/DevOps/commit/c8a7ee9444849950903823b6b8708dcbae43744e))
+
 ## [3.9.0](https://github.com/ExtendRealityLtd/DevOps/compare/v3.8.0...v3.9.0) (2019-10-14)
 
 

templates/steps/cd.yml

@@ -9,53 +9,45 @@ steps:
         tarball=$(find . -name "*.tgz")
         tarballFilePaths=$(tar -tf $tarball)
 
-        for filePath in $tarballFilePaths
+        while read -r filePath
         do
           case $filePath in
             *.meta)
               metaFilePath=$filePath
               found=false
               regularFilePath=${metaFilePath%.meta}
-              for otherFilePath in $tarballFilePaths
+              while read -r otherFilePath
               do
                 case $otherFilePath in
                   $regularFilePath/* | $regularFilePath*) # folder or file
-                    if [ $metaFilePath != $otherFilePath ]
+                    if [ "$metaFilePath" != "$otherFilePath" ]
                     then
                       found=true
                       break
                     fi;;
                 esac
-              done
+              done <<< "$tarballFilePaths"
               if [ "$found" = false ]
               then
-                echo "Missing file for Unity meta file '$metaFilePath'." >&2
+                echo "Missing file for Unity meta file '${metaFilePath#"package/"}'." >&2
               fi;;
-          esac
-        done
-
-        for filePath in $tarballFilePaths
-        do
-          case $filePath in
-            *.meta)
-              ;;
             *)
               regularFilePath=$filePath
               found=false
-              for otherFilePath in $tarballFilePaths
+              while read -r otherFilePath
               do
                 case $otherFilePath in
                   $regularFilePath.meta)
                     found=true
                     break;;
                 esac
-              done
+              done <<< "$tarballFilePaths"
               if [ "$found" = false ]
               then
-                echo "Missing Unity meta file for file '$regularFilePath'." >&2
+                echo "Missing Unity meta file for file '${regularFilePath#"package/"}'." >&2
               fi;;
           esac
-        done
+        done <<< "$tarballFilePaths"
 
         rm -f $tarball
       displayName: Check Unity .meta files