From b29c4e0cbcd833144b8069cb5c0c5ed79b9f26b0 Mon Sep 17 00:00:00 2001 From: Adam Reichold Date: Tue, 25 Oct 2022 11:11:37 +0200 Subject: [PATCH] Pin Valgrind task to 1.61.0 to avoid the DWARF5 issues until fixed upstream. --- .github/workflows/ci.yml | 8 ++++---- noxfile.py | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 441902ba94c..c1f79a4e4b2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -332,14 +332,14 @@ jobs: continue-on-error: true - uses: actions-rs/toolchain@v1 with: - toolchain: stable + # FIXME(adamreichold): Switch to stable when Valgrind understands DWARF5 as generated by LLVM 14, + # c.f. https://bugs.kde.org/show_bug.cgi?id=452758#c35 + toolchain: 1.61.0 override: true profile: minimal - uses: taiki-e/install-action@valgrind - run: python -m pip install -U pip nox - # FIXME(adamreichold): Drop skip-macros when Valgrind understands DWARF5 as generated by LLVM 14, - # c.f. https://bugs.kde.org/show_bug.cgi?id=452758#c35 - - run: nox -s test-rust -- release skip-full skip-macros + - run: nox -s test-rust -- release skip-full env: CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER: valgrind --leak-check=no --error-exitcode=1 RUST_BACKTRACE: 1 diff --git a/noxfile.py b/noxfile.py index e36f97f65e4..9f37de47879 100644 --- a/noxfile.py +++ b/noxfile.py @@ -21,9 +21,8 @@ def test(session: nox.Session) -> None: @nox.session(name="test-rust", venv_backend="none") def test_rust(session: nox.Session): _run_cargo_test(session, package="pyo3-build-config") - if not "skip-macros" in session.posargs: - _run_cargo_test(session, package="pyo3-macros-backend") - _run_cargo_test(session, package="pyo3-macros") + _run_cargo_test(session, package="pyo3-macros-backend") + _run_cargo_test(session, package="pyo3-macros") _run_cargo_test(session, package="pyo3-ffi") _run_cargo_test(session)