Skip to content

Commit 3acd481

Browse files
asgerfasgerf
committed
Merge branch 'main' into js/shared-dataflow-merge-main
2 parents 729efff + b392391 commit 3acd481

File tree

3,584 files changed

+82502
-53286
lines changed

Some content is hidden

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

3,584 files changed

+82502
-53286
lines changed

‎.bazelrc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,12 @@ common --registry=https://bcr.bazel.build
2424

2525
common --@rules_dotnet//dotnet/settings:strict_deps=false
2626

27+
# Reduce this eventually to empty, once we've fixed all our usages of java, and https://github.com/bazel-contrib/rules_go/issues/4193 is fixed
28+
common --incompatible_autoload_externally="+@rules_java,+@rules_shell"
29+
30+
build --java_language_version=17
31+
build --tool_java_language_version=17
32+
build --tool_java_runtime_version=remotejdk_17
33+
build --java_runtime_version=remotejdk_17
34+
2735
try-import %workspace%/local.bazelrc

‎.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.0.0rc1
1+
8.0.0

‎.devcontainer/devcontainer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
23
"extensions": [
34
"rust-lang.rust-analyzer",
45
"bungcip.better-toml",

‎.gitattributes

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,5 @@
8686
/misc/ripunzip/ripunzip-* filter=lfs diff=lfs merge=lfs -text
8787

8888
# swift prebuilt resources
89-
/swift/third_party/resource-dir/*.zip filter=lfs diff=lfs merge=lfs -text
89+
/swift/third_party/resources/*.zip filter=lfs diff=lfs merge=lfs -text
90+
/swift/third_party/resources/*.tar.zst filter=lfs diff=lfs merge=lfs -text

‎.github/workflows/compile-queries.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ on:
77
- "rc/*"
88
- "codeql-cli-*"
99
pull_request:
10+
paths:
11+
- '**.ql'
12+
- '**.qll'
13+
- '**/qlpack.yml'
14+
- '**.dbscheme'
1015

1116
permissions:
1217
contents: read
@@ -33,9 +38,9 @@ jobs:
3338
# run with --check-only if running in a PR (github.sha != main)
3439
if : ${{ github.event_name == 'pull_request' }}
3540
shell: bash
36-
run: codeql query compile -q -j0 */ql/{src,examples} --keep-going --warnings=error --check-only --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}" --compilation-cache-size=500
41+
run: codeql query compile -q -j0 */ql/{src,examples} --keep-going --warnings=error --check-only --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}" --compilation-cache-size=500 --ram=56000
3742
- name: compile queries - full
3843
# do full compile if running on main - this populates the cache
3944
if : ${{ github.event_name != 'pull_request' }}
4045
shell: bash
41-
run: codeql query compile -q -j0 */ql/{src,examples} --keep-going --warnings=error --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}" --compilation-cache-size=500
46+
run: codeql query compile -q -j0 */ql/{src,examples} --keep-going --warnings=error --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}" --compilation-cache-size=500 --ram=56000

‎.github/workflows/csharp-qltest.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,22 @@ on:
55
paths:
66
- "csharp/**"
77
- "shared/**"
8+
- "misc/bazel/**"
89
- .github/actions/fetch-codeql/action.yml
910
- codeql-workspace.yml
11+
- "MODULE.bazel"
1012
branches:
1113
- main
1214
- "rc/*"
1315
pull_request:
1416
paths:
1517
- "csharp/**"
1618
- "shared/**"
19+
- "misc/bazel/**"
1720
- .github/workflows/csharp-qltest.yml
1821
- .github/actions/fetch-codeql/action.yml
1922
- codeql-workspace.yml
23+
- "MODULE.bazel"
2024
branches:
2125
- main
2226
- "rc/*"

‎.github/workflows/swift.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,10 @@ jobs:
5050
- uses: ./swift/actions/build-and-test
5151
build-and-test-linux:
5252
if: github.repository_owner == 'github'
53-
runs-on: ubuntu-latest-xl
53+
runs-on: ubuntu-22.04
5454
steps:
5555
- uses: actions/checkout@v4
5656
- uses: ./swift/actions/build-and-test
57-
qltests-linux:
58-
if: github.repository_owner == 'github'
59-
needs: build-and-test-linux
60-
runs-on: ubuntu-latest-xl
61-
steps:
62-
- uses: actions/checkout@v4
63-
- uses: ./swift/actions/run-ql-tests
6457
qltests-macos:
6558
if: ${{ github.repository_owner == 'github' && github.event_name == 'pull_request' }}
6659
needs: build-and-test-macos
@@ -109,3 +102,10 @@ jobs:
109102
- uses: actions/checkout@v4
110103
- uses: ./.github/actions/fetch-codeql
111104
- uses: ./swift/actions/database-upgrade-scripts
105+
check-no-override:
106+
if : github.event_name == 'pull_request'
107+
runs-on: ubuntu-latest
108+
steps:
109+
- uses: actions/checkout@v4
110+
- shell: bash
111+
run: bazel test //swift/... --test_tag_filters=override --test_output=errors

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
# qltest projects and artifacts
1010
*.actual
11-
*/ql/test/**/*.testproj
11+
*/ql/test*/**/*.testproj
1212
*/ql/test/**/go.sum
1313

1414
# Visual studio temporaries, except a file used by QL4VS

‎.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ repos:
7272

7373
- id: rust-codegen
7474
name: Run Rust checked in code generation
75-
files: ^misc/codegen/|^rust/(schema.py$|codegen/|.*/generated/|ql/lib/(rust\.dbscheme$|codeql/rust/elements)|\.generated.list)
75+
files: ^misc/codegen/|^rust/(prefix\.dbscheme|schema/|codegen/|.*/generated/|ql/lib/(rust\.dbscheme$|codeql/rust/elements)|\.generated.list)
7676
language: system
7777
entry: bazel run //rust/codegen -- --quiet
7878
pass_filenames: false

‎.vscode/tasks.json

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,93 @@
3838
"command": "${config:python.pythonPath}",
3939
},
4040
"problemMatcher": []
41+
},
42+
{
43+
"label": "Create query change note",
44+
"type": "process",
45+
"command": "python3",
46+
"args": [
47+
"misc/scripts/create-change-note.py",
48+
"${input:language}",
49+
"src",
50+
"${input:name}",
51+
"${input:categoryQuery}"
52+
],
53+
"presentation": {
54+
"reveal": "never",
55+
"close": true
56+
},
57+
"problemMatcher": []
58+
},
59+
{
60+
"label": "Create library change note",
61+
"type": "process",
62+
"command": "python3",
63+
"args": [
64+
"misc/scripts/create-change-note.py",
65+
"${input:language}",
66+
"lib",
67+
"${input:name}",
68+
"${input:categoryLibrary}"
69+
],
70+
"presentation": {
71+
"reveal": "never",
72+
"close": true
73+
},
74+
"problemMatcher": []
75+
}
76+
],
77+
"inputs": [
78+
{
79+
"type": "pickString",
80+
"id": "language",
81+
"description": "Language",
82+
"options":
83+
[
84+
"go",
85+
"java",
86+
"javascript",
87+
"cpp",
88+
"csharp",
89+
"python",
90+
"ruby",
91+
"rust",
92+
"swift",
93+
]
94+
},
95+
{
96+
"type": "promptString",
97+
"id": "name",
98+
"description": "Short name (kebab-case)"
99+
},
100+
{
101+
"type": "pickString",
102+
"id": "categoryQuery",
103+
"description": "Category (query change)",
104+
"options":
105+
[
106+
"breaking",
107+
"deprecated",
108+
"newQuery",
109+
"queryMetadata",
110+
"majorAnalysis",
111+
"minorAnalysis",
112+
"fix",
113+
]
114+
},
115+
{
116+
"type": "pickString",
117+
"id": "categoryLibrary",
118+
"description": "Category (library change)",
119+
"options":
120+
[
121+
"breaking",
122+
"deprecated",
123+
"feature",
124+
"majorAnalysis",
125+
"minorAnalysis",
126+
"fix",
127+
]
41128
}
42129
]
43130
}

0 commit comments

Comments
 (0)