Skip to content

Commit 814118d

Browse files
committed
Merge remote-tracking branch 'upstream/main' into logging
2 parents f5459d7 + 4311553 commit 814118d

File tree

148 files changed

+3010
-1519
lines changed

Some content is hidden

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

148 files changed

+3010
-1519
lines changed

.devcontainer/swift/Dockerfile

Lines changed: 0 additions & 9 deletions
This file was deleted.

.devcontainer/swift/devcontainer.json

Lines changed: 0 additions & 25 deletions
This file was deleted.

.devcontainer/swift/root.sh

Lines changed: 0 additions & 34 deletions
This file was deleted.

.devcontainer/swift/update-codeql.sh

Lines changed: 0 additions & 20 deletions
This file was deleted.

.devcontainer/swift/user.sh

Lines changed: 0 additions & 15 deletions
This file was deleted.

.github/workflows/swift.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,6 @@ jobs:
4848
steps:
4949
- uses: actions/checkout@v4
5050
- uses: ./swift/actions/build-and-test
51-
build-and-test-linux:
52-
if: github.repository_owner == 'github'
53-
runs-on: ubuntu-22.04
54-
steps:
55-
- uses: actions/checkout@v4
56-
- uses: ./swift/actions/build-and-test
5751
qltests-macos:
5852
if: ${{ github.repository_owner == 'github' && github.event_name == 'pull_request' }}
5953
needs: build-and-test-macos

actions/extractor/tools/autobuild-impl.ps1

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,16 @@ if (($null -ne $env:LGTM_INDEX_INCLUDE) -or ($null -ne $env:LGTM_INDEX_EXCLUDE)
22
Write-Output 'Path filters set. Passing them through to the JavaScript extractor.'
33
} else {
44
Write-Output 'No path filters set. Using the default filters.'
5+
# Note: We're adding the `reusable_workflows` subdirectories to proactively
6+
# record workflows that were called cross-repo, check them out locally,
7+
# and enable an interprocedural analysis across the workflow files.
8+
# These workflows follow the convention `.github/reusable_workflows/<nwo>/*.ya?ml`
59
$DefaultPathFilters = @(
610
'exclude:**/*',
7-
'include:.github/workflows/**/*.yml',
8-
'include:.github/workflows/**/*.yaml',
11+
'include:.github/workflows/*.yml',
12+
'include:.github/workflows/*.yaml',
13+
'include:.github/reusable_workflows/**/*.yml',
14+
'include:.github/reusable_workflows/**/*.yaml',
915
'include:**/action.yml',
1016
'include:**/action.yaml'
1117
)

actions/extractor/tools/autobuild.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,16 @@
22

33
set -eu
44

5+
# Note: We're adding the `reusable_workflows` subdirectories to proactively
6+
# record workflows that were called cross-repo, check them out locally,
7+
# and enable an interprocedural analysis across the workflow files.
8+
# These workflows follow the convention `.github/reusable_workflows/<nwo>/*.ya?ml`
59
DEFAULT_PATH_FILTERS=$(cat << END
610
exclude:**/*
7-
include:.github/workflows/**/*.yml
8-
include:.github/workflows/**/*.yaml
11+
include:.github/workflows/*.yml
12+
include:.github/workflows/*.yaml
13+
include:.github/reusable_workflows/**/*.yml
14+
include:.github/reusable_workflows/**/*.yaml
915
include:**/action.yml
1016
include:**/action.yaml
1117
END

actions/ql/test/query-tests/Security/CWE-094/.github/workflows/self_needs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
jobs:
88
test1:
9-
runs-on: ubuntu-22.04
9+
runs-on: ubuntu-24.04
1010
outputs:
1111
job_output: ${{ steps.source.outputs.value }}
1212
steps:

actions/ql/test/query-tests/Security/CWE-094/.github/workflows/test10.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ jobs:
491491

492492
send_results:
493493
name: Send results to webhook
494-
runs-on: ubuntu-22.04
494+
runs-on: ubuntu-24.04
495495
if: always()
496496
needs: [
497497
setup,

0 commit comments

Comments
 (0)