fix sbt/scala cache key (actions#478)

Dogacel · web-flow · commit 404e5db3a1a0 · 2023-04-10T09:56:26.000+02:00
diff --git a/README.md b/README.md
@@ -116,7 +116,7 @@ Currently, the following distributions are supported:
 The action has a built-in functionality for caching and restoring dependencies. It uses [actions/cache](https://github.com/actions/cache) under hood for caching dependencies but requires less configuration settings. Supported package managers are gradle, maven and sbt. The format of the used cache key is `setup-java-${{ platform }}-${{ packageManager }}-${{ fileHash }}`, where the hash is based on the following files:
 - gradle: `**/*.gradle*`, `**/gradle-wrapper.properties`, `buildSrc/**/Versions.kt`, `buildSrc/**/Dependencies.kt`, and `gradle/*.versions.toml`
 - maven: `**/pom.xml`
-- sbt: all sbt build definition files `**/*.sbt`, `**/project/build.properties`, `**/project/**.{scala,sbt}`
+- sbt: all sbt build definition files `**/*.sbt`, `**/project/build.properties`, `**/project/**.scala`, `**/project/**.sbt`
 
 The workflow output `cache-hit` is set to indicate if an exact match was found for the key [as actions/cache does](https://github.com/actions/cache/tree/main#outputs).
 
diff --git a/__tests__/cache.test.ts b/__tests__/cache.test.ts
@@ -145,7 +145,7 @@ describe('dependency cache', () => {
         await expect(restore('sbt')).rejects.toThrow(
           `No file in ${projectRoot(
             workspace
-          )} matched to [**/*.sbt,**/project/build.properties,**/project/**.{scala,sbt}], make sure you have checked out the target repository`
+          )} matched to [**/*.sbt,**/project/build.properties,**/project/**.scala,**/project/**.sbt], make sure you have checked out the target repository`
         );
       });
       it('downloads cache', async () => {
@@ -156,6 +156,28 @@ describe('dependency cache', () => {
         expect(spyWarning).not.toHaveBeenCalled();
         expect(spyInfo).toHaveBeenCalledWith('sbt cache is not found');
       });
+      it('detects scala and sbt changes under **/project/ folder', async () => {
+        createFile(join(workspace, 'build.sbt'));
+        createDirectory(join(workspace, 'project'));
+        createFile(join(workspace, 'project/DependenciesV1.scala'));
+
+        await restore('sbt');
+        const firstCall = spySaveState.mock.calls.toString();
+
+        spySaveState.mockClear();
+        await restore('sbt');
+        const secondCall = spySaveState.mock.calls.toString();
+
+        // Make sure multiple restores produce the same cache
+        expect(firstCall).toBe(secondCall);
+
+        spySaveState.mockClear();
+        createFile(join(workspace, 'project/DependenciesV2.scala'));
+        await restore('sbt');
+        const thirdCall = spySaveState.mock.calls.toString();
+
+        expect(firstCall).not.toBe(thirdCall);
+      });
     });
   });
   describe('save', () => {
diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js
@@ -68416,7 +68416,8 @@ const supportedPackageManager = [
         pattern: [
             '**/*.sbt',
             '**/project/build.properties',
-            '**/project/**.{scala,sbt}'
+            '**/project/**.scala',
+            '**/project/**.sbt'
         ]
     }
 ];
diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -103621,7 +103621,8 @@ const supportedPackageManager = [
         pattern: [
             '**/*.sbt',
             '**/project/build.properties',
-            '**/project/**.{scala,sbt}'
+            '**/project/**.scala',
+            '**/project/**.sbt'
         ]
     }
 ];
diff --git a/src/cache.ts b/src/cache.ts
@@ -56,7 +56,8 @@ const supportedPackageManager: PackageManager[] = [
     pattern: [
       '**/*.sbt',
       '**/project/build.properties',
-      '**/project/**.{scala,sbt}'
+      '**/project/**.scala',
+      '**/project/**.sbt'
     ]
   }
 ];

Original file line number	Diff line number	Diff line change
`@@ -68416,7 +68416,8 @@ const supportedPackageManager = [`
`68416`	`68416`	`pattern: [`
`68417`	`68417`	`'*/.sbt',`
`68418`	`68418`	`'**/project/build.properties',`
`68419`		`- '/project/.{scala,sbt}'`
	`68419`	`+ '/project/.scala',`
	`68420`	`+ '/project/.sbt'`
`68420`	`68421`	`]`
`68421`	`68422`	`}`
`68422`	`68423`	`];`
Original file line number	Diff line number	Diff line change
`@@ -103621,7 +103621,8 @@ const supportedPackageManager = [`
`103621`	`103621`	`pattern: [`
`103622`	`103622`	`'*/.sbt',`
`103623`	`103623`	`'**/project/build.properties',`
`103624`		`- '/project/.{scala,sbt}'`
	`103624`	`+ '/project/.scala',`
	`103625`	`+ '/project/.sbt'`
`103625`	`103626`	`]`
`103626`	`103627`	`}`
`103627`	`103628`	`];`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,8 @@ const supportedPackageManager: PackageManager[] = [`
`56`	`56`	`pattern: [`
`57`	`57`	`'*/.sbt',`
`58`	`58`	`'**/project/build.properties',`
`59`		`- '/project/.{scala,sbt}'`
	`59`	`+ '/project/.scala',`
	`60`	`+ '/project/.sbt'`
`60`	`61`	`]`
`61`	`62`	`}`
`62`	`63`	`];`