From 06f582d009d2b852ba95e6c7b0bfeddd83cf9015 Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Thu, 1 Aug 2024 14:06:47 -0400 Subject: [PATCH] DNM: Manually retrigger ci with pinned abi3audit and old macosenv The latest release of abi3audit is incorrectly flagging certain symbols during the release build. To workaround this in the short term we'll need to pin abi3audit to avoid this. However for the 1.2.0rc1 release we are blocked from publishing the package on pypi until this is resolved. This commit manually updates the pyproject.toml to pin abi3audit and also adjusts the job config to push from a branch instead of the tag. Als the macos intel jobs were targeting macos-11 environments but this went EoL on github actions in June [1] and will not work. This commit bumps this to macos-12 instead. [1] https://github.blog/changelog/2024-05-20-actions-upcoming-changes-to-github-hosted-macos-runners/ --- .github/workflows/wheels.yml | 8 ++++---- pyproject.toml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index a33d025affc7..6f0597e89885 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -2,8 +2,8 @@ name: Wheel Builds on: push: - tags: - - '*' + branches: ['retrigger-ci'] + jobs: build_wheels: name: Build wheels @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-11, windows-latest, macos-14] + os: [ubuntu-latest, macos-12, windows-latest, macos-14] steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 @@ -47,7 +47,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-11] + os: [macos-12] steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 diff --git a/pyproject.toml b/pyproject.toml index b1f7b039e407..96cf1ea2cc6b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -156,14 +156,14 @@ environment = 'RUSTUP_TOOLCHAIN="stable"' [tool.cibuildwheel.linux] before-all = "yum install -y wget && {package}/tools/install_rust.sh" environment = 'PATH="$PATH:$HOME/.cargo/bin" CARGO_NET_GIT_FETCH_WITH_CLI="true" RUSTUP_TOOLCHAIN="stable"' -repair-wheel-command = "auditwheel repair -w {dest_dir} {wheel} && pipx run abi3audit --strict --report {wheel}" +repair-wheel-command = "auditwheel repair -w {dest_dir} {wheel} && pip install 'abi3audit==0.0.10' && abi3audit --strict --report {wheel}" [tool.cibuildwheel.macos] environment = "MACOSX_DEPLOYMENT_TARGET=10.12" -repair-wheel-command = "delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel} && pipx run abi3audit --strict --report {wheel}" +repair-wheel-command = "delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel} && pip install 'abi3audit==0.0.10' && abi3audit --strict --report {wheel}" [tool.cibuildwheel.windows] -repair-wheel-command = "cp {wheel} {dest_dir}/. && pipx run abi3audit --strict --report {wheel}" +repair-wheel-command = "cp {wheel} {dest_dir}/. && pip install abi3audit==0.0.10 && abi3audit --strict --report {wheel}" [tool.ruff] select = [