cleanup and corrections

dist/index.js

@@ -2181,18 +2181,13 @@ class RemoteBuilder {
           echo 'Initializing source repository for cloning with caching of LFS files'
           ${initializeSourceRepoForCaching}
           ls -alh "${testLFSFile}"
-          ls -alh "${lfsDirectory}"
           echo 'Source repository initialized'
           echo ' '
           echo 'Checking cache for the Unity project Library and git LFS files'
           ${handleCaching}
           echo 'Caching complete'
           echo ' '
-          cd ${this.repoPathFull}
-          git lfs pull
           ls -alh "${testLFSFile}"
-          zip -r lib-${buildUid}.zip "${lfsDirectory}"
-          cp lib-${buildUid}.zip "${cacheFolderFull}/${branchName}/lfs"
           echo ' '
           #
           echo 'buildVolumeReport.txt and buildVolumeReport.txt saved to repository workspace directory'

dist/remote-builder/cloneNoLFS.sh

@@ -25,4 +25,6 @@ echo ' '
 echo 'Contents of .lfs-assets-id-sum file:'
 cat .lfs-assets-id-sum
 
+export LFS_ASSETS_HASH=$(cat ".lfs-assets-id")
+
 echo ' '

dist/remote-builder/handleCaching.sh

@@ -7,43 +7,50 @@ gitLFSDestinationFolder=$4
 purgeRemoteBuilderCache=$5
 
 cacheFolderWithBranch="$cacheFolderFull/$branchName"
+lfsCacheFolder="$cacheFolderFull/$branchName/lfs"
+libraryCacheFolder="$cacheFolderFull/$branchName/lib"
 
-echo " "
-
-mkdir -p "$cacheFolderWithBranch/lib"
-mkdir -p "$cacheFolderWithBranch/lfs"
-
-echo "Library cache for branch: $branchName"
-ls -lh "$cacheFolderWithBranch"
-ls -lh "$cacheFolderWithBranch/lib"
-ls -lh "$cacheFolderWithBranch/lfs"
 echo ' '
 
+echo "LFS cache for branch: $branchName"
+mkdir -p "$lfsCacheFolder"
+ls -lh "$lfsCacheFolder"
+echo "Library cache for branch: $branchName"
+mkdir -p "$libraryCacheFolder"
+ls -lh "$libraryCacheFolder"
+
+echo ' '
+
+# if the unity git project has included the library delete it and echo a warning
 if [ -d "$libraryFolderFull" ]; then
   rm -r "$libraryFolderFull"
-  echo "Git must ignore the Library folder"
+  echo "!Warning!: The Unity library was included in the git repository (this isn't usually a good practice)"
 fi
 
 echo "Checking cache"
 
 # Restore library cache
-latest=$(ls -t "$cacheFolderWithBranch/lib" | egrep -i -e '\\.zip$' | head -1)
+latestLibraryCacheFile=$(ls -t "$libraryCacheFolder" | egrep -i -e '\\.zip$' | head -1)
 
-if [ ! -z "$latest" ]; then
+if [ ! -z "$latestLibraryCacheFile" ]; then
-  echo "Library cache exists from build $latest from $branchName"
+  echo "Library cache exists from build $latestLibraryCacheFile from $branchName"
   echo 'Creating empty Library folder for cache'
   mkdir "$libraryFolderFull"
-  unzip -q "$cacheFolderWithBranch/lib/$latest" -d "$libraryFolderFull"
+  unzip -q "$libraryCacheFolder/$latestLibraryCacheFile" -d "$libraryFolderFull"
 fi
 
 # Restore LFS cache
-latest=$(ls -t "$cacheFolderWithBranch/lfs" | egrep -i -e '\\.zip$' | head -1)
+if [[ ! -v "$LFS_ASSETS_HASH" ]]; then
+  latestLFSCacheFile=LFS_ASSETS_HASH
+else
+  latestLFSCacheFile=$(ls -t "$cacheFolderWithBranch/lfs" | egrep -i -e '\\.zip$' | head -1)
+fi
 
-if [ ! -z "$latest" ]; then
+if [ ! -z "$latestLFSCacheFile" ]; then
-  echo "Library cache exists from build $latest from $branchName"
+  echo "LFS cache exists from build $latestLFSCacheFile from $branchName"
-  echo 'Creating empty Library folder for cache'
+  rm -r "$gitLFSDestinationFolder"
-  mkdir "$libraryFolderFull"
+  mkdir -p "$gitLFSDestinationFolder"
-  unzip -q "$cacheFolderWithBranch/lfs/$latest" -d "$gitLFSDestinationFolder"
+  unzip -q "$cacheFolderWithBranch/lfs/$latestLFSCacheFile" -d "$gitLFSDestinationFolder"
 fi
 
 du -sch "$cacheFolderWithBranch/lfs"
@@ -59,3 +66,7 @@ echo "purge $purgeRemoteBuilderCache"
 if [ "$purgeRemoteBuilderCache" == "true" ]; then
   rm -r "$cacheFolderFull"
 fi
+
+git lfs pull
+zip -r $LFS_ASSETS_HASH "${lfsDirectory}"
+cp $LFS_ASSETS_HASH "${cacheFolderFull}/${branchName}/lfs"

src/model/remote-builder/remote-builder.ts

@@ -138,19 +138,13 @@ class RemoteBuilder {
           echo 'Initializing source repository for cloning with caching of LFS files'
           ${initializeSourceRepoForCaching}
           ls -alh "${testLFSFile}"
-          ls -alh "${lfsDirectory}"
           echo 'Source repository initialized'
           echo ' '
           echo 'Checking cache for the Unity project Library and git LFS files'
           ${handleCaching}
           echo 'Caching complete'
           echo ' '
-          cd ${this.repoPathFull}
-          git lfs pull
           ls -alh "${testLFSFile}"
-          ls -alh "${lfsDirectory}"
-          zip -r lib-${buildUid}.zip "${lfsDirectory}"
-          cp lib-${buildUid}.zip "${cacheFolderFull}/${branchName}/lfs"
           echo ' '
           #
           echo 'buildVolumeReport.txt and buildVolumeReport.txt saved to repository workspace directory'