From e57918c575c5edf0810bd229009fa88ca1fd5235 Mon Sep 17 00:00:00 2001 From: Amintor Dusko <87949283+AmintorDusko@users.noreply.github.com> Date: Wed, 3 Jul 2024 12:06:45 -0400 Subject: [PATCH] Cherry-picking some workflows changes (#784) **Context:** Release tests are failing in the plugin test matrix. **Description of the Change:** Cherry-picking some changes already in the RC branch. **Benefits:** Fix the [release-release](https://github.com/PennyLaneAI/pennylane-lightning/actions/workflows/compat-check-release-release.yml) workflow. I ran it manually against this branch to check. **Possible Drawbacks:** **Related GitHub Issues:** --------- Co-authored-by: Vincent Michaud-Rioux Co-authored-by: ringo-but-quantum --- .github/CHANGELOG.md | 3 +++ .github/workflows/tests_lgpu_python.yml | 4 ++-- .github/workflows/tests_lgpumpi_python.yml | 4 ++-- .github/workflows/tests_lkcpu_python.yml | 6 +++--- .github/workflows/tests_lkcuda_python.yml | 4 ++-- .github/workflows/tests_lmps_tncuda_python.yml | 2 +- .github/workflows/tests_lqcpu_python.yml | 4 ++-- .github/workflows/tests_without_binary.yml | 4 ++-- pennylane_lightning/core/_version.py | 2 +- 9 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index c526d307d..228be8d44 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -149,6 +149,9 @@ * Downgrade Scipy on Lightning stable version tests. [(#783)](https://github.com/PennyLaneAI/pennylane-lightning/pull/783) +* Fix checkout command in test workflows for rc branches. + [(#777)](https://github.com/PennyLaneAI/pennylane-lightning/pull/777) + ### Contributors This release contains contributions from (in alphabetical order): diff --git a/.github/workflows/tests_lgpu_python.yml b/.github/workflows/tests_lgpu_python.yml index f80672740..033534206 100644 --- a/.github/workflows/tests_lgpu_python.yml +++ b/.github/workflows/tests_lgpu_python.yml @@ -96,7 +96,7 @@ jobs: run: | cd main git fetch --all - git checkout $(git branch -a --list "origin/v*rc*" | tail -1) + git checkout $(git branch -a --list "origin/v0.*rc*" | sort | tail -1) - name: Switch to stable build of Lightning if: inputs.lightning-version == 'stable' @@ -165,7 +165,7 @@ jobs: run: | cd pennylane git fetch --all - git checkout $(git branch -a --list "origin/v*rc*" | tail -1) + git checkout $(git branch -a --list "origin/v0.*rc*" | sort | tail -1) python -m pip uninstall -y pennylane && python -m pip install . -vv --no-deps - name: Install Stable PennyLane diff --git a/.github/workflows/tests_lgpumpi_python.yml b/.github/workflows/tests_lgpumpi_python.yml index 8b97de972..3a1b1f357 100644 --- a/.github/workflows/tests_lgpumpi_python.yml +++ b/.github/workflows/tests_lgpumpi_python.yml @@ -61,7 +61,7 @@ jobs: if: inputs.lightning-version == 'release' run: | git fetch --all - git checkout $(git branch -a --list "origin/v*rc*" | tail -1) + git checkout $(git branch -a --list "origin/v0.*rc*" | sort | tail -1) - name: Switch to stable build of Lightning if: inputs.lightning-version == 'stable' @@ -129,7 +129,7 @@ jobs: run: | cd pennylane git fetch --all - git checkout $(git branch -a --list "origin/v*rc*" | tail -1) + git checkout $(git branch -a --list "origin/v0.*rc*" | sort | tail -1) python -m pip uninstall -y pennylane && python -m pip install . -vv --no-deps - name: Build and install package diff --git a/.github/workflows/tests_lkcpu_python.yml b/.github/workflows/tests_lkcpu_python.yml index 7efc1df00..8dca593af 100644 --- a/.github/workflows/tests_lkcpu_python.yml +++ b/.github/workflows/tests_lkcpu_python.yml @@ -76,7 +76,7 @@ jobs: run: | cd main git fetch --all - git checkout $(git branch -a --list "origin/v*rc*" | tail -1) + git checkout $(git branch -a --list "origin/v0.*rc*" | sort | tail -1) - name: Switch to stable build of Lightning if: inputs.lightning-version == 'stable' @@ -176,7 +176,7 @@ jobs: run: | cd main git fetch --all - git checkout $(git branch -a --list "origin/v*rc*" | tail -1) + git checkout $(git branch -a --list "origin/v0.*rc*" | sort | tail -1) - name: Switch to stable build of Lightning if: inputs.lightning-version == 'stable' @@ -227,7 +227,7 @@ jobs: run: | cd pennylane git fetch --all - git checkout $(git branch -a --list "origin/v*rc*" | tail -1) + git checkout $(git branch -a --list "origin/v0.*rc*" | sort | tail -1) python -m pip uninstall -y pennylane && python -m pip install . -vv --no-deps - name: Install Stable PennyLane diff --git a/.github/workflows/tests_lkcuda_python.yml b/.github/workflows/tests_lkcuda_python.yml index 1ca076c16..75f3c24f0 100644 --- a/.github/workflows/tests_lkcuda_python.yml +++ b/.github/workflows/tests_lkcuda_python.yml @@ -157,7 +157,7 @@ jobs: run: | cd main git fetch --all - git checkout $(git branch -a --list "origin/v*rc*" | tail -1) + git checkout $(git branch -a --list "origin/v0.*rc*" | sort | tail -1) - name: Switch to stable build of Lightning if: inputs.lightning-version == 'stable' @@ -221,7 +221,7 @@ jobs: run: | cd pennylane git fetch --all - git checkout $(git branch -a --list "origin/v*rc*" | tail -1) + git checkout $(git branch -a --list "origin/v0.*rc*" | sort | tail -1) python -m pip uninstall -y pennylane && python -m pip install . -vv --no-deps - name: Install Stable PennyLane diff --git a/.github/workflows/tests_lmps_tncuda_python.yml b/.github/workflows/tests_lmps_tncuda_python.yml index 3e9f6a1d9..12282878e 100644 --- a/.github/workflows/tests_lmps_tncuda_python.yml +++ b/.github/workflows/tests_lmps_tncuda_python.yml @@ -156,7 +156,7 @@ jobs: run: | cd pennylane git fetch --all - git checkout $(git branch -a --list "origin/v*rc*" | tail -1) + git checkout $(git branch -a --list "origin/v0.*rc*" | sort | tail -1) python -m pip uninstall -y pennylane && python -m pip install . -vv --no-deps - name: Install Stable PennyLane diff --git a/.github/workflows/tests_lqcpu_python.yml b/.github/workflows/tests_lqcpu_python.yml index 33eefa04d..cf2f55640 100644 --- a/.github/workflows/tests_lqcpu_python.yml +++ b/.github/workflows/tests_lqcpu_python.yml @@ -61,7 +61,7 @@ jobs: run: | cd main git fetch --all - git checkout $(git branch -a --list "origin/v*rc*" | tail -1) + git checkout $(git branch -a --list "origin/v0.*rc*" | sort | tail -1) - name: Switch to stable build of Lightning if: inputs.lightning-version == 'stable' @@ -170,7 +170,7 @@ jobs: run: | cd pennylane git fetch --all - git checkout $(git branch -a --list "origin/v*rc*" | tail -1) + git checkout $(git branch -a --list "origin/v0.*rc*" | sort | tail -1) python -m pip uninstall -y pennylane && python -m pip install . -vv --no-deps - name: Install Stable PennyLane diff --git a/.github/workflows/tests_without_binary.yml b/.github/workflows/tests_without_binary.yml index 919e162a4..eb2745e6c 100644 --- a/.github/workflows/tests_without_binary.yml +++ b/.github/workflows/tests_without_binary.yml @@ -53,7 +53,7 @@ jobs: run: | cd main git fetch --all - git checkout $(git branch -a --list "origin/v*rc*" | tail -1) + git checkout $(git branch -a --list "origin/v0.*rc*" | sort | tail -1) - name: Switch to stable build of Lightning if: inputs.lightning-version == 'stable' @@ -87,7 +87,7 @@ jobs: run: | cd pennylane git fetch --all - git checkout $(git branch -a --list "origin/v*rc*" | tail -1) + git checkout $(git branch -a --list "origin/v0.*rc*" | sort | tail -1) python -m pip uninstall -y pennylane && python -m pip install . -vv --no-deps - name: Install Stable PennyLane diff --git a/pennylane_lightning/core/_version.py b/pennylane_lightning/core/_version.py index 3d439e251..cc8cd04e2 100644 --- a/pennylane_lightning/core/_version.py +++ b/pennylane_lightning/core/_version.py @@ -16,4 +16,4 @@ Version number (major.minor.patch[-label]) """ -__version__ = "0.37.0-dev51" +__version__ = "0.37.0-dev52"