Skip to content

Commit 07c790a

Browse files
geoffw0geoffw0
committed
Merge branch 'main' into alamofire3
2 parents cf7cd2b + 6cb69c9 commit 07c790a

File tree

809 files changed

+64754
-84852
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

809 files changed

+64754
-84852
lines changed

‎.github/ISSUE_TEMPLATE/ql---general.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ assignees: ''
1010
**Description of the issue**
1111

1212
<!-- Please explain briefly what is the problem.
13-
If it is about an LGTM project, please include its URL.-->
13+
If it is about a GitHub project, please include its URL. -->
1414

‎.github/ISSUE_TEMPLATE/ql--false-positive.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: CodeQL False positive
2+
name: CodeQL false positive
33
about: Report CodeQL alerts that you think should not have been detected (not applicable, not exploitable, etc.)
44
title: False positive
55
labels: false-positive

‎.github/actions/cache-query-compilation/action.yml

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ outputs:
1414
runs:
1515
using: composite
1616
steps:
17-
# Cache the query compilation caches.
18-
# calculate the merge-base with main, in a way that works both on PRs and pushes to main.
17+
# calculate the merge-base with main, in a way that works both on PRs and pushes to main.
1918
- name: Calculate merge-base
2019
shell: bash
2120
if: ${{ github.event_name == 'pull_request' }}
@@ -24,38 +23,33 @@ runs:
2423
run: |
2524
MERGE_BASE=$(git cat-file commit $GITHUB_SHA | grep '^parent ' | head -1 | cut -f 2 -d " ")
2625
echo "merge_base=$MERGE_BASE" >> $GITHUB_ENV
27-
- name: Read CodeQL query compilation - PR
26+
- name: Restore read-only cache (PR)
2827
if: ${{ github.event_name == 'pull_request' }}
2928
uses: erik-krogh/actions-cache@a88d0603fe5fb5606db9f002dfcadeb32b5f84c6
3029
with:
3130
path: '**/.cache'
3231
read-only: true
33-
key: codeql-compile-${{ inputs.key }}-pr-${{ github.sha }} # deliberately not using the `compile-compile-main` keys here.
32+
key: codeql-compile-${{ inputs.key }}-pr-${{ github.sha }}
3433
restore-keys: |
3534
codeql-compile-${{ inputs.key }}-${{ github.base_ref }}-${{ env.merge_base }}
3635
codeql-compile-${{ inputs.key }}-${{ github.base_ref }}-
3736
codeql-compile-${{ inputs.key }}-main-
38-
- name: Fill CodeQL query compilation cache - main
37+
- name: Fill cache (push)
3938
if: ${{ github.event_name != 'pull_request' }}
4039
uses: erik-krogh/actions-cache@a88d0603fe5fb5606db9f002dfcadeb32b5f84c6
4140
with:
4241
path: '**/.cache'
4342
key: codeql-compile-${{ inputs.key }}-${{ github.ref_name }}-${{ github.sha }} # just fill on main
44-
restore-keys: | # restore from another random commit, to speed up compilation.
45-
codeql-compile-${{ inputs.key }}-${{ github.ref_name }}-
43+
restore-keys: | # restore the latest cache if the exact cache is unavailable, to speed up compilation.
44+
codeql-compile-${{ inputs.key }}-${{ github.ref_name }}-
4645
codeql-compile-${{ inputs.key }}-main-
4746
- name: Fill compilation cache directory
4847
id: fill-compilation-dir
49-
shell: bash
48+
shell: bash
5049
run: |
5150
# Move all the existing cache into another folder, so we only preserve the cache for the current queries.
52-
mkdir -p ${COMBINED_CACHE_DIR}
53-
rm -f **/.cache/{lock,size} # -f to avoid errors if the cache is empty.
54-
# copy the contents of the .cache folders into the combined cache folder.
55-
cp -r **/.cache/* ${COMBINED_CACHE_DIR}/ || : # ignore missing files
56-
# clean up the .cache folders
57-
rm -rf **/.cache/*
51+
node $GITHUB_WORKSPACE/.github/actions/cache-query-compilation/move-caches.js ${COMBINED_CACHE_DIR}
5852
5953
echo "compdir=${COMBINED_CACHE_DIR}" >> $GITHUB_OUTPUT
60-
env:
61-
COMBINED_CACHE_DIR: ${{ github.workspace }}/compilation-dir
54+
env:
55+
COMBINED_CACHE_DIR: ${{ runner.temp }}/compilation-dir

‎.github/actions/cache-query-compilation/move-caches.js

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
// # Move all the existing cache into another folder, so we only preserve the cache for the current queries.
2+
// mkdir -p ${COMBINED_CACHE_DIR}
3+
// rm -f **/.cache/{lock,size} # -f to avoid errors if the cache is empty.
4+
// # copy the contents of the .cache folders into the combined cache folder.
5+
// cp -r **/.cache/* ${COMBINED_CACHE_DIR}/ || : # ignore missing files
6+
// # clean up the .cache folders
7+
// rm -rf **/.cache/*
8+
9+
const fs = require("fs");
10+
const path = require("path");
11+
12+
// the first argv is the cache folder to create.
13+
const COMBINED_CACHE_DIR = process.argv[2];
14+
15+
function* walkCaches(dir) {
16+
const files = fs.readdirSync(dir, { withFileTypes: true });
17+
for (const file of files) {
18+
if (file.isDirectory()) {
19+
const filePath = path.join(dir, file.name);
20+
yield* walkCaches(filePath);
21+
if (file.name === ".cache") {
22+
yield filePath;
23+
}
24+
}
25+
}
26+
}
27+
28+
async function copyDir(src, dest) {
29+
for await (const file of await fs.promises.readdir(src, { withFileTypes: true })) {
30+
const srcPath = path.join(src, file.name);
31+
const destPath = path.join(dest, file.name);
32+
if (file.isDirectory()) {
33+
if (!fs.existsSync(destPath)) {
34+
fs.mkdirSync(destPath);
35+
}
36+
await copyDir(srcPath, destPath);
37+
} else {
38+
await fs.promises.copyFile(srcPath, destPath);
39+
}
40+
}
41+
}
42+
43+
async function main() {
44+
const cacheDirs = [...walkCaches(".")];
45+
46+
for (const dir of cacheDirs) {
47+
console.log(`Found .cache dir at ${dir}`);
48+
}
49+
50+
// mkdir -p ${COMBINED_CACHE_DIR}
51+
fs.mkdirSync(COMBINED_CACHE_DIR, { recursive: true });
52+
53+
// rm -f **/.cache/{lock,size} # -f to avoid errors if the cache is empty.
54+
await Promise.all(
55+
cacheDirs.map((cacheDir) =>
56+
(async function () {
57+
await fs.promises.rm(path.join(cacheDir, "lock"), { force: true });
58+
await fs.promises.rm(path.join(cacheDir, "size"), { force: true });
59+
})()
60+
)
61+
);
62+
63+
// # copy the contents of the .cache folders into the combined cache folder.
64+
// cp -r **/.cache/* ${COMBINED_CACHE_DIR}/ || : # ignore missing files
65+
await Promise.all(
66+
cacheDirs.map((cacheDir) => copyDir(cacheDir, COMBINED_CACHE_DIR))
67+
);
68+
69+
// # clean up the .cache folders
70+
// rm -rf **/.cache/*
71+
await Promise.all(
72+
cacheDirs.map((cacheDir) => fs.promises.rm(cacheDir, { recursive: true }))
73+
);
74+
}
75+
main();

‎.github/workflows/compile-queries.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,3 @@ jobs:
3535
if : ${{ github.event_name != 'pull_request' }}
3636
shell: bash
3737
run: codeql query compile -j0 */ql/{src,examples} --keep-going --warnings=error --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
38-
env:
39-
COMBINED_CACHE_DIR: ${{ github.workspace }}/compilation-dir

‎.github/workflows/csharp-qltest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
mv "$CODEQL_PATH/csharp/tools/extractor-asp.jar" "${{ github.workspace }}/csharp/extractor-pack/tools"
6868
# Safe guard against using the bundled extractor
6969
rm -rf "$CODEQL_PATH/csharp"
70-
codeql test run --threads=0 --ram 52000 --slice ${{ matrix.slice }} --search-path "${{ github.workspace }}/csharp/extractor-pack" --check-databases --check-undefined-labels --check-repeated-labels --check-redefined-labels --consistency-queries ql/consistency-queries ql/test --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
70+
codeql test run --threads=0 --ram 50000 --slice ${{ matrix.slice }} --search-path "${{ github.workspace }}/csharp/extractor-pack" --check-databases --check-undefined-labels --check-repeated-labels --check-redefined-labels --consistency-queries ql/consistency-queries ql/test --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
7171
env:
7272
GITHUB_TOKEN: ${{ github.token }}
7373
unit-tests:

‎.github/workflows/go-tests-other-os.yml

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
name: "Go: Run Tests - Other OS"
2+
on:
3+
pull_request:
4+
paths:
5+
- "go/**"
6+
- "!go/ql/**" # don't run other-os if only ql/ files changed
7+
- .github/workflows/go-tests-other-os.yml
8+
- .github/actions/**
9+
- codeql-workspace.yml
10+
jobs:
11+
test-mac:
12+
name: Test MacOS
13+
runs-on: macos-latest
14+
steps:
15+
- name: Set up Go 1.19
16+
uses: actions/setup-go@v3
17+
with:
18+
go-version: 1.19
19+
id: go
20+
21+
- name: Check out code
22+
uses: actions/checkout@v2
23+
24+
- name: Set up CodeQL CLI
25+
uses: ./.github/actions/fetch-codeql
26+
27+
- name: Enable problem matchers in repository
28+
shell: bash
29+
run: 'find .github/problem-matchers -name \*.json -exec echo "::add-matcher::{}" \;'
30+
31+
- name: Build
32+
run: |
33+
cd go
34+
make
35+
36+
- name: Cache compilation cache
37+
id: query-cache
38+
uses: ./.github/actions/cache-query-compilation
39+
with:
40+
key: go-qltest
41+
- name: Test
42+
run: |
43+
cd go
44+
make test cache="${{ steps.query-cache.outputs.cache-dir }}"
45+
46+
test-win:
47+
name: Test Windows
48+
runs-on: windows-latest-xl
49+
steps:
50+
- name: Set up Go 1.19
51+
uses: actions/setup-go@v3
52+
with:
53+
go-version: 1.19
54+
id: go
55+
56+
- name: Check out code
57+
uses: actions/checkout@v2
58+
59+
- name: Set up CodeQL CLI
60+
uses: ./.github/actions/fetch-codeql
61+
62+
- name: Enable problem matchers in repository
63+
shell: bash
64+
run: 'find .github/problem-matchers -name \*.json -exec echo "::add-matcher::{}" \;'
65+
66+
- name: Build
67+
run: |
68+
cd go
69+
make
70+
71+
- name: Cache compilation cache
72+
id: query-cache
73+
uses: ./.github/actions/cache-query-compilation
74+
with:
75+
key: go-qltest
76+
77+
- name: Test
78+
run: |
79+
cd go
80+
make test cache="${{ steps.query-cache.outputs.cache-dir }}"

‎.github/workflows/go-tests.yml

Lines changed: 17 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,24 @@
11
name: "Go: Run Tests"
22
on:
3+
push:
4+
paths:
5+
- "go/**"
6+
- .github/workflows/go-tests.yml
7+
- .github/actions/**
8+
- codeql-workspace.yml
9+
branches:
10+
- main
11+
- "rc/*"
312
pull_request:
413
paths:
514
- "go/**"
615
- .github/workflows/go-tests.yml
7-
- .github/actions/fetch-codeql/action.yml
16+
- .github/actions/**
817
- codeql-workspace.yml
918
jobs:
1019
test-linux:
1120
name: Test Linux (Ubuntu)
12-
runs-on: ubuntu-latest
21+
runs-on: ubuntu-latest-xl
1322
steps:
1423
- name: Set up Go 1.19
1524
uses: actions/setup-go@v3
@@ -32,7 +41,7 @@ jobs:
3241
cd go
3342
make
3443
35-
- name: Check that all QL and Go code is autoformatted
44+
- name: Check that all Go code is autoformatted
3645
run: |
3746
cd go
3847
make check-formatting
@@ -48,67 +57,13 @@ jobs:
4857
name: qhelp-markdown
4958
path: go/qhelp-out/**/*.md
5059

51-
- name: Test
52-
run: |
53-
cd go
54-
make test
55-
56-
test-mac:
57-
name: Test MacOS
58-
runs-on: macos-latest
59-
steps:
60-
- name: Set up Go 1.19
61-
uses: actions/setup-go@v3
62-
with:
63-
go-version: 1.19
64-
id: go
65-
66-
- name: Check out code
67-
uses: actions/checkout@v2
68-
69-
- name: Set up CodeQL CLI
70-
uses: ./.github/actions/fetch-codeql
71-
72-
- name: Enable problem matchers in repository
73-
shell: bash
74-
run: 'find .github/problem-matchers -name \*.json -exec echo "::add-matcher::{}" \;'
75-
76-
- name: Build
77-
run: |
78-
cd go
79-
make
80-
81-
- name: Test
82-
run: |
83-
cd go
84-
make test
85-
86-
test-win:
87-
name: Test Windows
88-
runs-on: windows-2019
89-
steps:
90-
- name: Set up Go 1.19
91-
uses: actions/setup-go@v3
60+
- name: Cache compilation cache
61+
id: query-cache
62+
uses: ./.github/actions/cache-query-compilation
9263
with:
93-
go-version: 1.19
94-
id: go
95-
96-
- name: Check out code
97-
uses: actions/checkout@v2
98-
99-
- name: Set up CodeQL CLI
100-
uses: ./.github/actions/fetch-codeql
101-
102-
- name: Enable problem matchers in repository
103-
shell: bash
104-
run: 'find .github/problem-matchers -name \*.json -exec echo "::add-matcher::{}" \;'
105-
106-
- name: Build
107-
run: |
108-
cd go
109-
make
64+
key: go-qltest
11065

11166
- name: Test
11267
run: |
11368
cd go
114-
make test
69+
make test cache="${{ steps.query-cache.outputs.cache-dir }}"

0 commit comments

Comments
 (0)