Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Merge main into releases/v3 #2886

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.

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
merged 32 commits into from
May 2, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
7eaba0d
build(deps): bump ruby/setup-ruby in the actions group
dependabot[bot] Apr 14, 2025
c0cffae
Update checks file
aeisenberg Apr 14, 2025
c9f0d30
build(deps): bump the npm group across 1 directory with 7 updates
dependabot[bot] Apr 21, 2025
95d52b7
Update checked-in dependencies
github-actions[bot] Apr 21, 2025
2594345
Update changelog and version after v3.28.16
github-actions[bot] Apr 23, 2025
7e00290
Update checked-in dependencies
github-actions[bot] Apr 23, 2025
4ffa236
Merge pull request #2867 from github/mergeback/v3.28.16-to-main-28deaeda
igfoo Apr 23, 2025
6ef9b92
Use proxy artifacts for `v2.21.1`
mbg Apr 24, 2025
eea52dd
Remove ubuntu-20.04 and add ubuntu-24.04
mbg Apr 25, 2025
d3b65fc
Merge pull request #2870 from github/mbg/ci/retire-ubuntu-20.04
mbg Apr 25, 2025
2264a4e
Merge branch 'main' into mbg/proxy/use-2.21.1-artifacts
mbg Apr 25, 2025
f843d94
Merge pull request #2869 from github/mbg/proxy/use-2.21.1-artifacts
mbg Apr 25, 2025
6ad5d99
Add `goproxy_server` to `LANGUAGE_TO_REGISTRY_TYPE`
mbg Mar 31, 2025
018ac1a
Merge pull request #2834 from github/mbg/private-registry/goproxy
mbg Apr 28, 2025
4b7eecf
Update default bundle to codeql-bundle-v2.21.2
github-actions[bot] Apr 28, 2025
6a3cfab
Add changelog note
github-actions[bot] Apr 28, 2025
83605b3
Merge pull request #2864 from github/dependabot/npm_and_yarn/npm-cac2…
henrymercer Apr 28, 2025
6893d12
build(deps-dev): bump the npm group with 2 updates
dependabot[bot] Apr 28, 2025
1817a33
Update checked-in dependencies
github-actions[bot] Apr 28, 2025
8ccb6b1
Merge pull request #2861 from github/dependabot/github_actions/action…
aeisenberg Apr 29, 2025
ed51cb5
Merge pull request #2873 from github/dependabot/npm_and_yarn/npm-a5e2…
henrymercer Apr 29, 2025
3ca9a88
Add actions-specific telemetry fields
aeisenberg Apr 29, 2025
40e16ed
Merge pull request #2874 from github/aeisenberg/add-actions-telemetry
aeisenberg Apr 30, 2025
5db14d0
Merge branch 'main' into update-bundle/codeql-bundle-v2.21.2
nickrolfe May 1, 2025
083772a
Do not fail diff informed analyses when `analyze` is run twice in the…
henrymercer May 1, 2025
f122d1d
Address test failures from computing temporary directory too early
henrymercer May 1, 2025
62fbeb6
Merge branch 'main' into henrymercer/fix-diff-informed-multiple-analyze
henrymercer May 1, 2025
1569f4c
Disable diff-informed queries in code scanning config tests
henrymercer May 1, 2025
81a9508
Merge pull request #2876 from github/henrymercer/fix-diff-informed-mu…
henrymercer May 1, 2025
9aba20e
Merge branch 'main' into update-bundle/codeql-bundle-v2.21.2
nickrolfe May 1, 2025
97a2bfd
Merge pull request #2872 from github/update-bundle/codeql-bundle-v2.21.2
nickrolfe May 1, 2025
0d5a311
Update changelog for v3.28.17
github-actions[bot] May 2, 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
Address test failures from computing temporary directory too early
These relied on the RUNNER_TEMP environment variable that does not necessarily exist when running locally.
  • Loading branch information
henrymercer committed May 1, 2025
commit f122d1dc9eb83b12dc16b38495b667a2dddfa6f9
78 changes: 40 additions & 38 deletions 78 lib/dependency-caching.js

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

2 changes: 1 addition & 1 deletion 2 lib/dependency-caching.js.map

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

78 changes: 40 additions & 38 deletions 78 src/dependency-caching.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,42 +41,44 @@ export function getJavaTempDependencyDir(): string {
/**
* Default caching configurations per language.
*/
const CODEQL_DEFAULT_CACHE_CONFIG: { [language: string]: CacheConfig } = {
java: {
paths: [
// Maven
join(os.homedir(), ".m2", "repository"),
// Gradle
join(os.homedir(), ".gradle", "caches"),
// CodeQL Java build-mode: none
getJavaTempDependencyDir(),
],
hash: [
// Maven
"**/pom.xml",
// Gradle
"**/*.gradle*",
"**/gradle-wrapper.properties",
"buildSrc/**/Versions.kt",
"buildSrc/**/Dependencies.kt",
"gradle/*.versions.toml",
"**/versions.properties",
],
},
csharp: {
paths: [join(os.homedir(), ".nuget", "packages")],
hash: [
// NuGet
"**/packages.lock.json",
// Paket
"**/paket.lock",
],
},
go: {
paths: [join(os.homedir(), "go", "pkg", "mod")],
hash: ["**/go.sum"],
},
};
function getDefaultCacheConfig(): { [language: string]: CacheConfig } {
return {
java: {
paths: [
// Maven
join(os.homedir(), ".m2", "repository"),
// Gradle
join(os.homedir(), ".gradle", "caches"),
// CodeQL Java build-mode: none
getJavaTempDependencyDir(),
],
hash: [
// Maven
"**/pom.xml",
// Gradle
"**/*.gradle*",
"**/gradle-wrapper.properties",
"buildSrc/**/Versions.kt",
"buildSrc/**/Dependencies.kt",
"gradle/*.versions.toml",
"**/versions.properties",
],
},
csharp: {
paths: [join(os.homedir(), ".nuget", "packages")],
hash: [
// NuGet
"**/packages.lock.json",
// Paket
"**/paket.lock",
],
},
go: {
paths: [join(os.homedir(), "go", "pkg", "mod")],
hash: ["**/go.sum"],
},
};
}

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

for (const language of languages) {
const cacheConfig = CODEQL_DEFAULT_CACHE_CONFIG[language];
const cacheConfig = getDefaultCacheConfig()[language];

if (cacheConfig === undefined) {
logger.info(
Expand Down Expand Up @@ -150,7 +152,7 @@ export async function downloadDependencyCaches(
*/
export async function uploadDependencyCaches(config: Config, logger: Logger) {
for (const language of config.languages) {
const cacheConfig = CODEQL_DEFAULT_CACHE_CONFIG[language];
const cacheConfig = getDefaultCacheConfig()[language];

if (cacheConfig === undefined) {
logger.info(
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.