Skip to content

Commit c10ed29

Browse files
henrymercerhenrymercer
authored
Merge main into henrymercer/swift-resource-dir-thinning
2 parents 613eeaf + f1f964c commit c10ed29

578 files changed

Lines changed: 9545 additions & 3178 deletions

File tree

Some content is hidden

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

‎MODULE.bazel‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,11 +237,13 @@ use_repo(
237237
swift,
238238
"swift_toolchain",
239239
"swift_toolchain_ubuntu22.04",
240+
"swift_toolchain_ubuntu22.04-aarch64",
240241
"swift_toolchain_xcode",
241242
)
242243

243244
register_toolchains(
244245
"@swift_toolchain//:swift_toolchain_exec_ubuntu22.04",
246+
"@swift_toolchain//:swift_toolchain_exec_ubuntu22.04-aarch64",
245247
"@swift_toolchain//:swift_toolchain_exec_xcode",
246248
dev_dependency = True,
247249
)

‎actions/extractor/tools/autobuild-impl.ps1‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ $DefaultPathFilters = @(
99
'include:.github/reusable_workflows/**/*.yml',
1010
'include:.github/reusable_workflows/**/*.yaml',
1111
'include:**/action.yml',
12-
'include:**/action.yaml'
12+
'include:**/action.yaml',
13+
'include:**/actions.lock'
1314
)
1415

1516
if ($null -ne $env:LGTM_INDEX_FILTERS) {

‎actions/extractor/tools/autobuild.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ include:.github/reusable_workflows/**/*.yml
1414
include:.github/reusable_workflows/**/*.yaml
1515
include:**/action.yml
1616
include:**/action.yaml
17+
include:**/actions.lock
1718
END
1819
)
1920

‎actions/extractor/tools/baseline-config.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
".github/reusable_workflows/**/*.yml",
66
".github/reusable_workflows/**/*.yaml",
77
"**/action.yml",
8-
"**/action.yaml"
8+
"**/action.yaml",
9+
"**/actions.lock"
910
]
1011
}

‎actions/ql/integration-tests/actions-lock/query/actions.ql‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import codeql.actions.Lock
2+
3+
from ActionsLock lock
4+
select lock.getFile()

‎actions/ql/integration-tests/actions-lock/query/qlpack.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
name: codeql/actions-lock-integration-test
2+
dependencies:
3+
codeql/actions-all: "*"
4+
warnOnImplicitThis: true

‎actions/ql/integration-tests/actions-lock/src/.github/workflows/test.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
on: push
2+
jobs:
3+
test:
4+
runs-on: ubuntu-latest
5+
steps:
6+
- run: echo test

‎actions/ql/integration-tests/actions-lock/src/actions.lock‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# This file is machine-generated by `gh actions-lock`.
2+
# Do not edit by hand; run `gh actions-lock` to update.
3+
# Docs: https://gh.io/actions-lockfile
4+
version: 'v0.0.2'
5+
workflows:
6+
'.github/workflows/test.yml':
7+
- 'actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1'
8+
- 'github/codeql-action@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28'
9+
dependencies:
10+
'actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1':
11+
ref: '3d3c42e5aac5ba805825da76410c181273ba90b1'
12+
commit: 'sha1-3d3c42e5aac5ba805825da76410c181273ba90b1'
13+
owner_id: 44036562
14+
repo_id: 197814629
15+
'github/codeql-action@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28':
16+
ref: 'v4.37.8'
17+
commit: 'sha1-db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28'
18+
owner_id: 9919
19+
repo_id: 259445878

‎actions/ql/integration-tests/actions-lock/test.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
def test_actions_lock(codeql, actions, javascript):
2+
codeql.database.create(source_root="src", language="actions")
3+
output = codeql.query.run("query/actions.ql", database="test-db", _capture=True)
4+
assert "actions.lock" in output

‎actions/ql/lib/CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions

0 commit comments

Comments
 (0)