Skip to content

Commit db1171a

Browse files
committed
Merge branch 'sycl' into win-e2esplit
2 parents ee4da02 + 1d0e1eb commit db1171a

File tree

105 files changed

+1716
-640
lines changed

Some content is hidden

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

105 files changed

+1716
-640
lines changed

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
with:
103103
fetch-depth: 1
104104
- name: Setup Python env
105-
uses: actions/setup-python@v5.4.0
105+
uses: actions/setup-python@v5.5.0
106106
with:
107107
python-version: '3.11'
108108
cache: 'pip'

.github/workflows/llvm-project-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
# lldb. Using this setup-python action to make 3.10 the default
8383
# python fixes this.
8484
- name: Setup Python
85-
uses: actions/setup-python@v5.4.0
85+
uses: actions/setup-python@v5.5.0
8686
with:
8787
python-version: ${{ inputs.python_version }}
8888
- name: Install Ninja

.github/workflows/pr-code-format.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
clangformat: 19.1.6
6666

6767
- name: Setup Python env
68-
uses: actions/setup-python@v5.4.0
68+
uses: actions/setup-python@v5.5.0
6969
with:
7070
python-version: '3.11'
7171
cache: 'pip'

.github/workflows/release-binaries.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
steps:
6868
# It's good practice to use setup-python, but this is also required on macos-14
6969
# due to https://github.com/actions/runner-images/issues/10385
70-
- uses: actions/setup-python@6ca8e8598faa206f7140a65ba31b899bebe16f58
70+
- uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55
7171
with:
7272
python-version: '3.12'
7373

@@ -297,7 +297,7 @@ jobs:
297297

298298
- name: Attest Build Provenance
299299
id: provenance
300-
uses: actions/attest-build-provenance@bd77c077858b8d561b7a36cbe48ef4cc642ca39d # v2.2.2
300+
uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.3
301301
with:
302302
subject-path: ${{ needs.prepare.outputs.release-binary-filename }}
303303

.github/workflows/release-documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
3838

3939
- name: Setup Python env
40-
uses: actions/setup-python@v5.4.0
40+
uses: actions/setup-python@v5.5.0
4141
with:
4242
cache: 'pip'
4343
cache-dependency-path: './llvm/docs/requirements.txt'

.github/workflows/release-doxygen.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
4444

4545
- name: Setup Python env
46-
uses: actions/setup-python@v5.4.0
46+
uses: actions/setup-python@v5.5.0
4747
with:
4848
cache: 'pip'
4949
cache-dependency-path: './llvm/docs/requirements.txt'

.github/workflows/release-sources.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
- name: Attest Build Provenance
9393
if: github.event_name != 'pull_request'
9494
id: provenance
95-
uses: actions/attest-build-provenance@bd77c077858b8d561b7a36cbe48ef4cc642ca39d # v2.2.2
95+
uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.3
9696
with:
9797
subject-path: "*.xz"
9898
- if: github.event_name != 'pull_request'

.github/workflows/sycl-detect-changes.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,15 @@ jobs:
1717
outputs:
1818
filters: ${{ steps.result.outputs.result }}
1919
steps:
20+
- name: Set changed_files
21+
id: changed_files
22+
shell: bash
23+
run: |
24+
echo "changed_file_cnt=${{ github.event.pull_request.changed_files }}" >> $GITHUB_OUTPUT
25+
2026
- name: Check file changes
2127
uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
28+
if: steps.changed_files.outputs.changed_file_cnt < 500
2229
id: changes
2330
with:
2431
filters: |
@@ -81,9 +88,7 @@ jobs:
8188
uses: actions/github-script@v7
8289
with:
8390
script: |
84-
console.log("Number of files changed:");
85-
console.log(context.payload.pull_request.changed_files);
86-
if (context.payload.pull_request.changed_files < 500) {
91+
if (${{steps.changed_files.outputs.changed_file_cnt}} < 500) {
8792
return '${{ steps.changes.outputs.changes }}';
8893
}
8994
// Treat everything as changed for huge PRs.

.github/workflows/sycl-linux-precommit.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ on:
2222
- '.github/workflows/sycl-macos-*.yml'
2323
- '.github/workflows/sycl-nightly.yml'
2424
- '.github/workflows/sycl-rel-nightly.yml'
25+
- '.github/workflows/trivy.yml'
2526
- 'devops/containers/**'
2627
- 'devops/actions/build_container/**'
2728

.github/workflows/sycl-linux-run-tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,7 @@ jobs:
281281
- name: Run E2E Tests
282282
if: inputs.tests_selector == 'e2e'
283283
uses: ./devops/actions/run-tests/e2e
284+
timeout-minutes: 60
284285
with:
285286
ref: ${{ inputs.tests_ref || inputs.repo_ref || github.sha }}
286287
binaries_artifact: ${{ inputs.e2e_binaries_artifact }}

0 commit comments

Comments
 (0)