WIP

.github/workflows/release.yml

@@ -62,11 +62,9 @@ jobs:
 
     - uses: actions/cache@v2
       with:
-        path: './root-cache'
+        path: './.action-docker-layer-caching-docker_images'
         key: aws-cli-docker-image-sha-${{ github.sha }}-root
-        restore-keys: |
-          aws-cli-docker-image-sha
-    - run: ls ./root-cache
+    - run: ls ./.action-docker-layer-caching-docker_images
 
   test_restoring:
     runs-on: ubuntu-latest

main.ts

@@ -7,6 +7,7 @@ const main = async () => {
 
   const layerCache = new LayerCache(repotag)
   await layerCache.restore(key)
+  await layerCache.cleanUp()
 }
 
 main().catch(e => {

post.ts

@@ -7,9 +7,6 @@ const main = async () => {
 
   const layerCache = new LayerCache(repotag)
   await layerCache.store(key)
-  const layercache2 = new LayerCache(repotag)
-  // layercache2.imagesDir = `docker_images_restore`
-  await layercache2.restore(key)
 }
 
 main().catch(e => {

src/LayerCache.ts

@@ -30,12 +30,11 @@ class LayerCache {
   async store(key: string) {
     this.originalKeyToStore = key
     await this.saveImageAsUnpacked()
-    // await this.separateAllLayerCaches()
+    await this.separateAllLayerCaches()
     // Todo: remove await
     const storeRoot = await this.storeRoot()
-    // const storeLayers = this.storeLayers()
-    // await Promise.all([storeRoot, storeLayers])
-    await this.cleanUp()
+    const storeLayers = this.storeLayers()
+    await Promise.all([storeRoot, storeLayers])
   }
 
   private async saveImageAsUnpacked() {
@@ -109,14 +108,13 @@ class LayerCache {
       return false
     }
 
-    // const hasRestoredAllLayers = await this.restoreLayers()
-    // if (!hasRestoredAllLayers) {
-    //   core.info(`Some layer cache could not be found. aborting.`)
-    //   return false
-    // }
-    // await this.joinAllLayerCaches()
+    const hasRestoredAllLayers = await this.restoreLayers()
+    if (!hasRestoredAllLayers) {
+      core.info(`Some layer cache could not be found. aborting.`)
+      return false
+    }
+    await this.joinAllLayerCaches()
     await this.loadImageFromUnpacked()
-    await this.cleanUp()
     return true
   }