Skip to content

Commit e60df2c

Browse files
authored
Merge branch 'main' into jb1/isLibraryFile-nomagic
2 parents 15f92fc + 54d9eda commit e60df2c

File tree

1,443 files changed

+105143
-65733
lines changed

Some content is hidden

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

1,443 files changed

+105143
-65733
lines changed

.bazelrc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
common --enable_platform_specific_config
2-
common --enable_bzlmod
32
# because we use --override_module with `%workspace%`, the lock file is not stable
43
common --lockfile_mode=off
54

@@ -25,6 +24,5 @@ common --registry=https://bcr.bazel.build
2524

2625
common --@rules_dotnet//dotnet/settings:strict_deps=false
2726
common --experimental_isolated_extension_usages
28-
common --incompatible_use_plus_in_repo_names
2927

3028
try-import %workspace%/local.bazelrc

.bazelversion

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

.github/codeql/codeql-config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ paths-ignore:
99
- '/python/'
1010
- '/javascript/ql/test'
1111
- '/javascript/extractor/tests'
12+
- '/rust/ql/test'
13+
- '/rust/ql/integration-tests'

.github/labeler.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ Swift:
3838
- swift/**/*
3939
- change-notes/**/*swift*
4040

41+
Actions:
42+
- actions/**/*
43+
- change-notes/**/*actions*
44+
4145
documentation:
4246
- "**/*.qhelp"
4347
- "**/*.md"

.github/workflows/build-ripunzip.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
os: [ubuntu-20.04, macos-12, windows-2019]
20+
os: [ubuntu-20.04, macos-13, windows-2019]
2121
runs-on: ${{ matrix.os }}
2222
steps:
2323
- uses: actions/checkout@v4
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: PowerShell PR Check
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- main
7+
workflow_dispatch:
8+
9+
jobs:
10+
powershell-pr-check:
11+
name: powershell-pr-check
12+
runs-on: ubuntu-latest
13+
if: github.repository == 'microsoft/codeql'
14+
permissions:
15+
contents: write
16+
steps:
17+
- name: Checkout
18+
uses: actions/checkout@v3
19+
with:
20+
fetch-depth: 0
21+
token: ${{ secrets.WORKFLOW_TOKEN }}
22+
- name: Setup CodeQL
23+
uses: ./.github/actions/fetch-codeql
24+
with:
25+
channel: release
26+
- name: Compile PowerShell Queries
27+
run: |
28+
codeql query compile --check-only --keep-going powershell/ql/src

.github/workflows/rust-analysis.yml

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
name: "Code scanning - Rust"
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- 'rc/*'
8+
pull_request:
9+
branches:
10+
- main
11+
- 'rc/*'
12+
paths:
13+
- '**/*.rs'
14+
- '**/Cargo.toml'
15+
- '.github/codeql/codeql-config.yml'
16+
- '.github/workflows/rust-analysis.yml'
17+
schedule:
18+
- cron: '0 9 * * 1'
19+
20+
env:
21+
CODEQL_ENABLE_EXPERIMENTAL_FEATURES: "true"
22+
23+
jobs:
24+
analyze:
25+
strategy:
26+
matrix:
27+
language: [ 'rust' ]
28+
29+
runs-on: ubuntu-latest
30+
31+
permissions:
32+
contents: read
33+
security-events: write
34+
pull-requests: read
35+
36+
steps:
37+
- name: Checkout repository
38+
uses: actions/checkout@v4
39+
40+
- name: Query latest nightly CodeQL bundle
41+
shell: bash
42+
id: codeql
43+
env:
44+
GITHUB_TOKEN: ${{ github.token }}
45+
run: |
46+
REPO=dsp-testing/codeql-cli-nightlies
47+
TAG=$(
48+
gh release list -R $REPO -L1 --exclude-drafts --json tagName -q ".[] | .tagName"
49+
)
50+
echo "nightly_bundle=https://github.com/$REPO/releases/download/$TAG/codeql-bundle-linux64.tar.zst" \
51+
| tee -a "$GITHUB_OUTPUT"
52+
53+
- name: Initialize CodeQL
54+
uses: github/codeql-action/init@main
55+
with:
56+
tools: ${{ steps.codeql.outputs.nightly_bundle }}
57+
languages: ${{ matrix.language }}
58+
config-file: ./.github/codeql/codeql-config.yml
59+
60+
- name: Autobuild
61+
uses: github/codeql-action/autobuild@main
62+
63+
- name: Perform CodeQL Analysis
64+
uses: github/codeql-action/analyze@main

.github/workflows/swift.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
# without waiting for the macOS build
4545
build-and-test-macos:
4646
if: github.repository_owner == 'github'
47-
runs-on: macos-12-xl
47+
runs-on: macos-13-xlarge
4848
steps:
4949
- uses: actions/checkout@v4
5050
- uses: ./swift/actions/build-and-test
@@ -64,7 +64,7 @@ jobs:
6464
qltests-macos:
6565
if: ${{ github.repository_owner == 'github' && github.event_name == 'pull_request' }}
6666
needs: build-and-test-macos
67-
runs-on: macos-12-xl
67+
runs-on: macos-13-xlarge
6868
steps:
6969
- uses: actions/checkout@v4
7070
- uses: ./swift/actions/run-ql-tests

.github/workflows/sync-main.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,22 @@ jobs:
2121
run: |
2222
git config user.name Dilan Bhalla
2323
git config user.email [email protected]
24-
- name: Fetch
24+
- name: Sync Main
2525
shell: bash
2626
run: |
2727
set -x
2828
git fetch
2929
git remote add upstream https://github.com/github/codeql.git
3030
git fetch upstream --tags --force
31-
- name: Sync Main
31+
git merge codeql-cli/latest
32+
- name: Setup CodeQL
33+
uses: ./.github/actions/fetch-codeql
34+
- name: Compile PowerShell Queries
35+
run: |
36+
codeql query compile --check-only --keep-going powershell/ql/src
37+
- name: Complete Sync
3238
shell: bash
3339
run: |
34-
git merge codeql-cli/latest
3540
git push origin main
3641
git push origin --tags --force
3742

CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
/ql/ @github/codeql-ql-for-ql-reviewers
2424

2525
# Bazel (excluding BUILD.bazel files)
26-
WORKSPACE.bazel @github/codeql-ci-reviewers
2726
MODULE.bazel @github/codeql-ci-reviewers
2827
.bazelversion @github/codeql-ci-reviewers
2928
.bazelrc @github/codeql-ci-reviewers

0 commit comments

Comments
 (0)