8000 Address test failures from computing temporary directory too early · github/codeql-action@f122d1d · GitHub
[go: up one dir, main page]
Skip to content

Commit f122d1d

Browse files
henrymercerhenrymercer
committed
Address test failures from computing temporary directory too early
These relie 8000 d on the RUNNER_TEMP environment variable that does not necessarily exist when running locally.
1 parent 083772a commit f122d1d

File tree

3 files changed

+81
-77
lines changed

3 files changed

+81
-77
lines changed

‎lib/dependency-caching.js

+40-38
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/dependency-caching.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/dependency-caching.ts

+40-38
Original file line numberDiff line numberDiff line change
@@ -41,42 +41,44 @@ export function getJavaTempDependencyDir(): string {
4141
/**
4242
* Default caching configurations per language.
4343
*/
44-
const CODEQL_DEFAULT_CACHE_CONFIG: { [language: string]: CacheConfig } = {
45-
java: {
46-
paths: [
47-
// Maven
48-
join(os.homedir(), ".m2", "repository"),
49-
// Gradle
50-
join(os.homedir(), ".gradle", "caches"),
51-
// CodeQL Java build-mode: none
52-
getJavaTempDependencyDir(),
53-
],
54-
hash: [
55-
// Maven
56-
"**/pom.xml",
57-
// Gradle
58-
"**/*.gradle*",
59-
"**/gradle-wrapper.properties",
60-
"buildSrc/**/Versions.kt",
61-
"buildSrc/**/Dependencies.kt",
62-
"gradle/*.versions.toml",
63-
"**/versions.properties",
64-
],
65-
},
66-
csharp: {
67-
paths: [join(os.homedir(), ".nuget", "packages")],
68-
hash: [
69-
// NuGet
70-
"**/packages.lock.json",
71-
// Paket
72-
"**/paket.lock",
73-
],
74-
},
75-
go: {
76-
paths: [join(os.homedir(), "go", "pkg", "mod")],
77-
hash: ["**/go.sum"],
78-
},
79-
};
44+
function getDefaultCacheConfig(): { [language: string]: CacheConfig } {
45+
return {
46+
java: {
47+
paths: [
48+
// Maven
49+
join(os.homedir(), ".m2", "repository"),
50+
// Gradle
51+
join(os.homedir(), ".gradle", "caches"),
52+
// CodeQL Java build-mode: none
53+
getJavaTempDependencyDir(),
54+
],
55+
hash: [
56+
// Maven
57+
"**/pom.xml",
58+
// Gradle
59+
"**/*.gradle*",
60+
"**/gradle-wrapper.properties",
61+
"buildSrc/**/Versions.kt",
62+
"buildSrc/**/Dependencies.kt",
63+
"gradle/*.versions.toml",
64+
"**/versions.properties",
65+
],
66+
},
67+
csharp: {
68+
paths: [join(os.homedir(), ".nuget", "packages")],
69+
hash: [
70+
// NuGet
71+
"**/packages.lock.json",
72+
// Paket
73+
"**/paket.lock",
74+
],
75+
},
76+
go: {
77+
paths: [join(os.homedir(), "go", "pkg", "mod")],
78+
hash: ["**/go.sum"],
79+
},
80+
};
81+
}
8082

8183
async function makeGlobber(patterns: string[]): Promise<glob.Globber> {
8284
return glob.create(patterns.join("\n"));
@@ -96,7 +98,7 @@ export async function downloadDependencyCaches(
9698
const restoredCaches: Language[] = [];
9799

98100
for (const language of languages) {
99-
const cacheConfig = CODEQL_DEFAULT_CACHE_CONFIG[language];
101+
const cacheConfig = getDefaultCacheConfig()[language];
100102

101103
if (cacheConfig === undefined) {
102104
logger.info(
@@ -150,7 +152,7 @@ export async function downloadDependencyCaches(
150152
*/
151153
export async function uploadDependencyCaches(config: Config, logger: Logger) {
152154
for (const language of config.languages) {
153-
const cacheConfig = CODEQL_DEFAULT_CACHE_CONFIG[language];
155+
const cacheConfig = getDefaultCacheConfig()[language];
154156

155157
if (cacheConfig === undefined) {
156158
logger.info(

0 commit comments

Comments
 (0)
0