Skip to content

Commit 62bd3ac

Browse files
authored
Merge branch 'main' into maikypedia/swift-zip
2 parents ed052cc + bcfce56 commit 62bd3ac

File tree

651 files changed

+51106
-10938
lines changed

Some content is hidden

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

651 files changed

+51106
-10938
lines changed

.clang-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
DisableFormat: true

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Setup dotnet
3131
uses: actions/setup-dotnet@v4
3232
with:
33-
dotnet-version: 8.0.100
33+
dotnet-version: 8.0.101
3434

3535
- name: Checkout repository
3636
uses: actions/checkout@v4

.github/workflows/csharp-qltest.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@ jobs:
7474
- name: Setup dotnet
7575
uses: actions/setup-dotnet@v4
7676
with:
77-
dotnet-version: 8.0.100
77+
dotnet-version: 8.0.101
7878
- name: Extractor unit tests
7979
run: |
80-
dotnet test -p:RuntimeFrameworkVersion=8.0.0 extractor/Semmle.Util.Tests
81-
dotnet test -p:RuntimeFrameworkVersion=8.0.0 extractor/Semmle.Extraction.Tests
82-
dotnet test -p:RuntimeFrameworkVersion=8.0.0 autobuilder/Semmle.Autobuild.CSharp.Tests
83-
dotnet test -p:RuntimeFrameworkVersion=8.0.0 "${{ github.workspace }}/cpp/autobuilder/Semmle.Autobuild.Cpp.Tests"
80+
dotnet test -p:RuntimeFrameworkVersion=8.0.1 extractor/Semmle.Util.Tests
81+
dotnet test -p:RuntimeFrameworkVersion=8.0.1 extractor/Semmle.Extraction.Tests
82+
dotnet test -p:RuntimeFrameworkVersion=8.0.1 autobuilder/Semmle.Autobuild.CSharp.Tests
83+
dotnet test -p:RuntimeFrameworkVersion=8.0.1 "${{ github.workspace }}/cpp/autobuilder/Semmle.Autobuild.Cpp.Tests"
8484
shell: bash
8585
stubgentest:
8686
runs-on: ubuntu-latest

.github/workflows/swift.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,15 @@ jobs:
7373
steps:
7474
- uses: actions/checkout@v4
7575
- uses: ./swift/actions/run-integration-tests
76+
clang-format:
77+
if : ${{ github.event_name == 'pull_request' }}
78+
runs-on: ubuntu-latest
79+
steps:
80+
- uses: actions/checkout@v4
81+
- uses: pre-commit/action@646c83fcd040023954eafda54b4db0192ce70507
82+
name: Check that python code is properly formatted
83+
with:
84+
extra_args: clang-format --all-files
7685
codegen:
7786
if : ${{ github.event_name == 'pull_request' }}
7887
runs-on: ubuntu-latest
@@ -82,12 +91,12 @@ jobs:
8291
- uses: actions/setup-python@v4
8392
with:
8493
python-version-file: 'swift/.python-version'
85-
- uses: pre-commit/action@v3.0.0
94+
- uses: pre-commit/action@646c83fcd040023954eafda54b4db0192ce70507
8695
name: Check that python code is properly formatted
8796
with:
8897
extra_args: autopep8 --all-files
8998
- uses: ./.github/actions/fetch-codeql
90-
- uses: pre-commit/action@v3.0.0
99+
- uses: pre-commit/action@646c83fcd040023954eafda54b4db0192ce70507
91100
name: Check that QL generated code was checked in
92101
with:
93102
extra_args: swift-codegen --all-files

.pre-commit-config.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@ repos:
1010
exclude: /test/.*$(?<!\.ql)(?<!\.qll)(?<!\.qlref)|.*\.patch
1111

1212
- repo: https://github.com/pre-commit/mirrors-clang-format
13-
rev: v13.0.1
13+
rev: v17.0.6
1414
hooks:
1515
- id: clang-format
16-
files: ^swift/.*\.(h|c|cpp)$
1716

1817
- repo: https://github.com/pre-commit/mirrors-autopep8
1918
rev: v1.6.0
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
class Declaration extends @declaration {
2+
string toString() { none() }
3+
}
4+
5+
class MangledName extends @mangledname {
6+
string toString() { none() }
7+
}
8+
9+
from Declaration d, MangledName n
10+
where mangled_name(d, n, _)
11+
select d, n

0 commit comments

Comments
 (0)