Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated CI workflows to avoid race conditions on PRs with concurrency label #778

Merged
merged 31 commits into from
Jul 3, 2024
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
8b8ff4e
Updated CI workflows to avoid race conditions on PRs with concurrency…
rashidnhm Jun 26, 2024
8aa8463
Auto update version from '0.37.0-dev49' to '0.37.0-dev50'
ringo-but-quantum Jun 26, 2024
ccd6c2e
Update Changelog
rashidnhm Jun 27, 2024
6de3aa6
Merge branch 'sc-66955-fix-ci-race-condition' of github.com:PennyLane…
rashidnhm Jun 27, 2024
0a62856
Trigger CIs
AmintorDusko Jun 28, 2024
e86b032
Trigger CIs
AmintorDusko Jun 28, 2024
c7ecac9
Trigger CI
rashidnhm Jul 2, 2024
8704fec
Merge branch 'sc-66955-fix-ci-race-condition' of github.com:PennyLane…
rashidnhm Jul 2, 2024
fbf1999
Trigger CI
rashidnhm Jul 2, 2024
121d782
Temporary update .github/workflows/update_dev_version.yml
maliasadi Jul 2, 2024
904123d
Apply suggestions from code review
maliasadi Jul 2, 2024
d939cd8
Update tests_lgpu_cpp
maliasadi Jul 2, 2024
7a93de6
Put back existing lgpu group
rashidnhm Jul 2, 2024
996475f
Try: Revert everything back to github.event. Try testing some hypothesis
rashidnhm Jul 2, 2024
38171cf
Try
rashidnhm Jul 2, 2024
5d27cac
try event name again
rashidnhm Jul 2, 2024
2a21292
try event name again
rashidnhm Jul 2, 2024
b0fb092
Trigger CI
rashidnhm Jul 2, 2024
d51fabc
Update another workflow with event_name
rashidnhm Jul 2, 2024
c12f44a
Update another workflow with event_name
rashidnhm Jul 2, 2024
99d0edc
Try setting PYTHONPATH for venv
rashidnhm Jul 2, 2024
615c6b6
Try activating venv
rashidnhm Jul 2, 2024
73692fd
Try passing path to python executable
rashidnhm Jul 2, 2024
6aad67c
Try passing Python_SITELIB
rashidnhm Jul 2, 2024
3305271
Try setting Python(3)_ROOT_DIR
rashidnhm Jul 2, 2024
3e31f5b
Fix
rashidnhm Jul 2, 2024
627e43a
Set Python_ROOT_DIR, in more workflows
rashidnhm Jul 2, 2024
ccbd1cb
Move over workflows over to using event_name. Install scipy for lgpu_cpp
rashidnhm Jul 2, 2024
c336aa5
Add venv to final workflow
rashidnhm Jul 2, 2024
e52ab5c
Merge branch 'master' into sc-66955-fix-ci-race-condition
maliasadi Jul 3, 2024
e94b402
Auto update version from '0.37.0-dev50' to '0.37.0-dev51'
ringo-but-quantum Jul 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@

### Improvements

* Updated concurrency labels for tests ensuring different workflows do not run under the same concurrency group label
[(#778)](https://github.com/PennyLaneAI/pennylane-lightning/pull/778)

* Release candidate branches are automatically switched over to using the new large GitHub runner pool.
[(#769)](https://github.com/PennyLaneAI/pennylane-lightning/pull/769)

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests_lgpu_cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ env:
TORCH_VERSION: 1.11.0+cpu

concurrency:
group: tests_lgpu_cpp-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
group: tests_lgpu_cpp-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
cancel-in-progress: true

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests_lgpu_python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ env:
TORCH_VERSION: 1.11.0+cpu

concurrency:
group: tests_lgpu_python-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
group: tests_lgpu_python-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
cancel-in-progress: true

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests_lgpumpi_cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ env:
CI_CUDA_ARCH: 86

concurrency:
group: tests_lgpumpi_cpp-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
group: tests_lgpumpi_cpp-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
cancel-in-progress: true

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests_lgpumpi_python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ env:
CI_CUDA_ARCH: 86

concurrency:
group: tests_lgpumpi_python-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
group: tests_lgpumpi_python-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
cancel-in-progress: true

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests_linux_cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ env:
OMP_PROC_BIND: "false"

concurrency:
group: tests_linux_cpp-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
group: tests_linux_cpp-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
cancel-in-progress: true

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests_lkcpu_python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ env:
OMP_PROC_BIND: "false"

concurrency:
group: tests_lkcpu_python-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
group: tests_lkcpu_python-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
cancel-in-progress: true

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests_lkcuda_cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ env:
TORCH_VERSION: 1.11.0+cpu

concurrency:
group: tests_lkcuda_cpp-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
group: tests_lkcuda_cpp-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
cancel-in-progress: true

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests_lkcuda_python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ env:
TORCH_VERSION: 1.11.0+cpu

concurrency:
group: tests_lkcuda_python-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
group: tests_lkcuda_python-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
cancel-in-progress: true

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests_lmps_tncuda_cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ env:
GCC_VERSION: 11

concurrency:
group: tests_lmps_tncuda_cpp-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
group: tests_lmps_tncuda_cpp-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
cancel-in-progress: true

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests_lmps_tncuda_python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ env:
GCC_VERSION: 11

concurrency:
group: tests_lmps_tncuda_python-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
group: tests_lmps_tncuda_python-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
cancel-in-progress: true

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests_lqcpu_python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ env:
OMP_PROC_BIND: "false"

concurrency:
group: tests_lqcpu_python-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
group: tests_lqcpu_python-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
cancel-in-progress: true

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests_windows_cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:
- '!pennylane_lightning/core/src/simulators/lightning_gpu/**'

concurrency:
group: tests_windows_cpp-${{ github.ref }}-${{ github.event }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
group: tests_windows_cpp-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
cancel-in-progress: true

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests_without_binary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ env:
COVERAGE_FLAGS: "--cov=pennylane_lightning --cov-report=term-missing --cov-report=xml:./coverage.xml --no-flaky-report -p no:warnings --tb=native"

concurrency:
group: tests_without_binary-${{ github.ref }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
group: tests_without_binary-${{ github.ref }}-${{ github.event_name }}-${{ inputs.lightning-version }}-${{ inputs.pennylane-version }}
cancel-in-progress: true

jobs:
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/update_dev_version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ on:
branches:
- master

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true


jobs:
update-dev-version:
name: Update version for development branches
Expand Down
2 changes: 1 addition & 1 deletion pennylane_lightning/core/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
Version number (major.minor.patch[-label])
"""

__version__ = "0.37.0-dev49"
__version__ = "0.37.0-dev50"
Loading