Skip to content

Commit d9205c2

Browse files
committed
[GitHub] Fix concurrency queued cancellation issue with libclang
Fixes PR llvm#77219. Issue llvm#76664. Issue llvm#76601.
1 parent 9b76515 commit d9205c2

File tree

2 files changed

+7
-16
lines changed

2 files changed

+7
-16
lines changed

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,16 @@ on:
2222
- '.github/workflows/libclang-python-tests.yml'
2323
- '.github/workflows/llvm-project-tests.yml'
2424

25-
concurrency:
26-
# Skip intermediate builds: always.
27-
# Cancel intermediate builds: only if it is a pull request build.
28-
group: ${{ github.workflow }}-${{ github.ref }}
29-
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
30-
3125
jobs:
3226
check-clang-python:
3327
# Build libclang and then run the libclang Python binding's unit tests.
3428
name: Build and run Python unit tests
3529
if: github.repository == 'llvm/llvm-project'
36-
strategy:
37-
fail-fast: false
38-
matrix:
39-
python-version: ["3.7", "3.11"]
4030
uses: ./.github/workflows/llvm-project-tests.yml
4131
with:
4232
build_target: check-clang-python
4333
projects: clang
4434
# There is an issue running on "windows-2019".
4535
# See https://github.com/llvm/llvm-project/issues/76601#issuecomment-1873049082.
4636
os_list: '["ubuntu-latest"]'
47-
python_version: ${{ matrix.python-version }}
37+
python_version_list: '["3.7", "3.11"]'

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ on:
1515
os_list:
1616
required: false
1717
default: '["ubuntu-latest", "windows-2019", "macOS-13"]'
18-
python_version:
18+
python_version_list:
1919
required: false
2020
type: string
21-
default: '3.11'
21+
default: '["3.11"]'
2222
workflow_call:
2323
inputs:
2424
build_target:
@@ -41,10 +41,10 @@ on:
4141
# https://developercommunity.visualstudio.com/t/Prev-Issue---with-__assume-isnan-/1597317
4242
default: '["ubuntu-latest", "windows-2019", "macOS-13"]'
4343

44-
python_version:
44+
python_version_list:
4545
required: false
4646
type: string
47-
default: '3.11'
47+
default: '["3.11"]'
4848

4949
concurrency:
5050
# Skip intermediate builds: always.
@@ -66,6 +66,7 @@ jobs:
6666
fail-fast: false
6767
matrix:
6868
os: ${{ fromJSON(inputs.os_list) }}
69+
python_version: ${{ fromJSON(inputs.python_version_list) }}
6970
steps:
7071
- name: Setup Windows
7172
if: startsWith(matrix.os, 'windows')
@@ -79,7 +80,7 @@ jobs:
7980
- name: Setup Python
8081
uses: actions/setup-python@v4
8182
with:
82-
python-version: ${{ inputs.python_version }}
83+
python-version: ${{ matrix.python_version }}
8384
- name: Install Ninja
8485
if: runner.os != 'Linux'
8586
uses: llvm/actions/install-ninja@main

0 commit comments

Comments
 (0)