Skip to content

Commit cd90ecf

Browse files
Merge from 'main' to 'sycl-web' (164 commits)
CONFLICT (content): Merge conflict in llvm/lib/IR/AutoUpgrade.cpp
2 parents acd2cd6 + 430a40d commit cd90ecf

File tree

2,699 files changed

+43865
-34236
lines changed

Some content is hidden

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

2,699 files changed

+43865
-34236
lines changed

.github/workflows/issue-subscriber.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,20 @@ jobs:
1313
runs-on: ubuntu-latest
1414
if: github.repository == 'llvm/llvm-project'
1515
steps:
16+
- name: Checkout Automation Script
17+
uses: actions/checkout@v4
18+
with:
19+
sparse-checkout: llvm/utils/git/
20+
ref: main
21+
1622
- name: Setup Automation Script
23+
working-directory: ./llvm/utils/git/
1724
run: |
18-
curl -O -L --fail https://raw.githubusercontent.com/"$GITHUB_REPOSITORY"/"$GITHUB_SHA"/llvm/utils/git/github-automation.py
19-
curl -O -L --fail https://raw.githubusercontent.com/"$GITHUB_REPOSITORY"/"$GITHUB_SHA"/llvm/utils/git/requirements.txt
2025
chmod a+x github-automation.py
2126
pip install -r requirements.txt
2227
2328
- name: Update watchers
29+
working-directory: ./llvm/utils/git/
2430
# https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions#using-an-intermediate-environment-variable
2531
env:
2632
LABEL_NAME: ${{ github.event.label.name }}

.github/workflows/libclang-python-tests.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,15 @@ jobs:
3030
check-clang-python:
3131
# Build libclang and then run the libclang Python binding's unit tests.
3232
name: Build and run Python unit tests
33+
strategy:
34+
fail-fast: false
35+
matrix:
36+
python-version: ["3.7", "3.11"]
3337
uses: ./.github/workflows/llvm-project-tests.yml
3438
with:
3539
build_target: check-clang-python
3640
projects: clang
3741
# There is an issue running on "windows-2019".
3842
# See https://github.com/llvm/llvm-project/issues/76601#issuecomment-1873049082.
3943
os_list: '["ubuntu-latest"]'
44+
python_version: ${{ matrix.python-version }}

.github/workflows/libcxx-build-and-test.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ concurrency:
3535

3636

3737
env:
38-
CMAKE: "/opt/bin/cmake"
3938
# LLVM POST-BRANCH bump version
4039
# LLVM POST-BRANCH add compiler test for ToT - 1, e.g. "Clang 17"
4140
# LLVM RELEASE bump remove compiler ToT - 3, e.g. "Clang 15"
@@ -169,24 +168,18 @@ jobs:
169168
'bootstrapping-build'
170169
]
171170
machine: [ 'libcxx-runners-8-set' ]
172-
std_modules: [ 'OFF' ]
173171
include:
174172
- config: 'generic-cxx26'
175173
machine: libcxx-runners-8-set
176-
std_modules: 'ON'
177174
- config: 'generic-asan'
178175
machine: libcxx-runners-8-set
179-
std_modules: 'OFF'
180176
- config: 'generic-tsan'
181177
machine: libcxx-runners-8-set
182-
std_modules: 'OFF'
183178
- config: 'generic-ubsan'
184179
machine: libcxx-runners-8-set
185-
std_modules: 'OFF'
186180
# Use a larger machine for MSAN to avoid timeout and memory allocation issues.
187181
- config: 'generic-msan'
188182
machine: libcxx-runners-8-set
189-
std_modules: 'OFF'
190183
runs-on: ${{ matrix.machine }}
191184
steps:
192185
- uses: actions/checkout@v4
@@ -196,7 +189,6 @@ jobs:
196189
CC: clang-18
197190
CXX: clang++-18
198191
ENABLE_CLANG_TIDY: "OFF"
199-
ENABLE_STD_MODULES: ${{ matrix.std_modules }}
200192
- uses: actions/upload-artifact@v3
201193
if: always()
202194
with:

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ on:
1515
os_list:
1616
required: false
1717
default: '["ubuntu-latest", "windows-2019", "macOS-11"]'
18+
python_version:
19+
required: false
20+
type: string
21+
default: '3.11'
1822
workflow_call:
1923
inputs:
2024
build_target:
@@ -38,6 +42,11 @@ on:
3842
# https://github.com/actions/virtual-environments/issues/5900
3943
default: '["ubuntu-latest", "windows-2019", "macOS-11"]'
4044

45+
python_version:
46+
required: false
47+
type: string
48+
default: '3.11'
49+
4150
concurrency:
4251
# Skip intermediate builds: always.
4352
# Cancel intermediate builds: only if it is a pull request build.
@@ -67,7 +76,7 @@ jobs:
6776
- name: Setup Python
6877
uses: actions/setup-python@v4
6978
with:
70-
python-version: '3.11'
79+
python-version: ${{ inputs.python_version }}
7180
- name: Install Ninja
7281
uses: llvm/actions/install-ninja@main
7382
# actions/checkout deletes any existing files in the new git directory,

.github/workflows/new-prs.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,20 @@ jobs:
3434
(github.event.pull_request.author_association != 'MEMBER') &&
3535
(github.event.pull_request.author_association != 'OWNER')
3636
steps:
37+
- name: Checkout Automation Script
38+
uses: actions/checkout@v4
39+
with:
40+
sparse-checkout: llvm/utils/git/
41+
ref: main
42+
3743
- name: Setup Automation Script
44+
working-directory: ./llvm/utils/git/
3845
run: |
39-
curl -O -L --fail https://raw.githubusercontent.com/"$GITHUB_REPOSITORY"/main/llvm/utils/git/github-automation.py
40-
curl -O -L --fail https://raw.githubusercontent.com/"$GITHUB_REPOSITORY"/main/llvm/utils/git/requirements.txt
4146
chmod a+x github-automation.py
4247
pip install -r requirements.txt
4348
4449
- name: Greet Author
50+
working-directory: ./llvm/utils/git/
4551
run: |
4652
./github-automation.py \
4753
--token '${{ secrets.GITHUB_TOKEN }}' \

.github/workflows/pr-subscriber.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,20 @@ jobs:
1313
runs-on: ubuntu-latest
1414
if: github.repository == 'llvm/llvm-project'
1515
steps:
16+
- name: Checkout Automation Script
17+
uses: actions/checkout@v4
18+
with:
19+
sparse-checkout: llvm/utils/git/
20+
ref: main
21+
1622
- name: Setup Automation Script
23+
working-directory: ./llvm/utils/git/
1724
run: |
18-
curl -O -L --fail https://raw.githubusercontent.com/"$GITHUB_REPOSITORY"/main/llvm/utils/git/github-automation.py
19-
curl -O -L --fail https://raw.githubusercontent.com/"$GITHUB_REPOSITORY"/main/llvm/utils/git/requirements.txt
2025
chmod a+x github-automation.py
2126
pip install -r requirements.txt
2227
2328
- name: Update watchers
29+
working-directory: ./llvm/utils/git/
2430
run: |
2531
./github-automation.py \
2632
--token '${{ secrets.ISSUE_SUBSCRIBER_TOKEN }}' \

clang/bindings/python/README.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ runner. For example:
1010
--
1111
$ env PYTHONPATH=$(echo ~/llvm/clang/bindings/python/) \
1212
CLANG_LIBRARY_PATH=$(llvm-config --libdir) \
13-
python -m unittest discover -v
13+
python3 -m unittest discover -v
1414
tests.cindex.test_index.test_create ... ok
1515
...
1616

0 commit comments

Comments
 (0)