Skip to content

Support non-lock files for C# cache key computation #3117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mbg merged 16 commits into from
Nov 12, 2025
Merged

Support non-lock files for C# cache key computation #3117

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1ca20ab
Add `CsharpNewCacheKey` FF
mbg Sep 17, 2025
2aa1f55
Propagate `features` into `cachePrefix` function
mbg Sep 17, 2025
2a7680f
Change `getDefaultCacheConfig` to be a `const` by turning `paths` int…
mbg Sep 17, 2025
ab1c842
Change `hash` to be a function that can use `Features`
mbg Sep 17, 2025
6b48207
Move check whether there are files for hashing into `getHashPatterns`
mbg Sep 17, 2025
0324490
Use additional files for C# key hashes if `Feature.CsharpNewCacheKey`…
mbg Sep 17, 2025
0cbd930
Move `createCacheKeyHash` to `caching-utils`
mbg Nov 5, 2025
03b2dc2
Add and use `getFeaturePrefix` for dependency caching
mbg Nov 5, 2025
2680455
Use `undefined` instead of `NoMatchingFilesError`
mbg Nov 5, 2025
46e03b4
Fix JSDoc param name
mbg Nov 9, 2025
71abac7
Fix comment in `getCsharpHashPatterns`
mbg Nov 9, 2025
35c91ef
Add tests for `getCsharpHashPatterns`
mbg Nov 9, 2025
b0e9dfc
Restore missing `status.push` resulting from a bad merge
mbg Nov 9, 2025
a47d550
Restore earlier log messages for `checkHashPatterns`
mbg Nov 9, 2025
4885eb2
Insert new `featurePrefix` after general cache key `prefix`
mbg Nov 9, 2025
48a56f6
Add some tests for `downloadDependencyCaches` related to feature pref…
mbg Nov 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Restore earlier log messages for checkHashPatterns
  • Loading branch information
@mbg
mbg committed Nov 9, 2025
commit a47d5507cfc59e8bf828011bfbf2808490c2182d
5 changes: 3 additions & 2 deletions lib/analyze-action.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions lib/init-action.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions src/dependency-caching.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ test("checkHashPatterns - logs when no patterns match", async (t) => {
features,
KnownLanguage.csharp,
config,
"download",
getRecordingLogger(messages),
);

Expand Down Expand Up @@ -158,6 +159,7 @@ test("checkHashPatterns - returns patterns when patterns match", async (t) => {
features,
KnownLanguage.csharp,
config,
"upload",
getRecordingLogger(messages),
);

Expand Down
6 changes: 5 additions & 1 deletion src/dependency-caching.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ export type DependencyCacheRestoreStatusReport = DependencyCacheRestoreStatus[];
* @param features Information about which FFs are enabled.
* @param language The language the `CacheConfig` is for. For use in the log message.
* @param cacheConfig The caching configuration to call `getHashPatterns` on.
* @param checkType Whether we are checking the patterns for a download or upload.
* @param logger The logger to write the log message to if there is an error.
* @returns An array of glob patterns to use for hashing files, or `undefined` if there are no matching files.
*/
Expand All @@ -209,13 +210,14 @@ export async function checkHashPatterns(
features: FeatureEnablement,
language: Language,
cacheConfig: CacheConfig,
checkType: "download" | "upload",
logger: Logger,
): Promise<string[] | undefined> {
const patterns = await cacheConfig.getHashPatterns(codeql, features);

if (patterns === undefined) {
logger.info(
`Skipping download of dependency cache for ${language} as we cannot calculate a hash for the cache key.`,
`Skipping ${checkType} of dependency cache for ${language} as we cannot calculate a hash for the cache key.`,
);
}

Expand Down Expand Up @@ -257,6 +259,7 @@ export async function downloadDependencyCaches(
features,
language,
cacheConfig,
"download",
logger,
);
if (patterns === undefined) {
Expand Down Expand Up @@ -354,6 +357,7 @@ export async function uploadDependencyCaches(
features,
language,
cacheConfig,
"upload",
logger,
);
if (patterns === undefined) {
Expand Down