From d870d9517f4adc2a3c53ccf849716ca8c11f0249 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Mon, 9 Feb 2026 11:59:30 +0100 Subject: [PATCH] CI: cache needs to consider runner.arch Seen this on the macOS arm64 runner: ImportError: dlopen(/Users/runner/work/borg/borg/.tox/py311-none/lib/python3.11/site-packages/_argon2_cffi_bindings/_ffi.abi3.so, 0x0002): tried: '/Users/runner/work/borg/borg/.tox/py311-none/lib/python3.11/site-packages/_argon2_cffi_bindings/_ffi.abi3.so' (mach-o file, but is an incompatible architecture (have 'x86_64', need 'arm64e' or 'arm64')), '/System/Volumes/Preboot/Cryptexes/OS/Users/runner/work/borg/borg/.tox/py311-none/lib/python3.11/site-packages/_argon2_cffi_bindings/_ffi.abi3.so' (no such file), '/Users/runner/work/borg/borg/.tox/py311-none/lib/python3.11/site-packages/_argon2_cffi_bindings/_ffi.abi3.so' (mach-o file, but is an incompatible architecture (have 'x86_64', need 'arm64e' or 'arm64')) --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b3abdcd02..195c9103b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -174,19 +174,19 @@ jobs: uses: actions/cache@v4 with: path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('requirements.d/development.txt') }} + key: ${{ runner.os }}-${{ runner.arch }}-pip-${{ hashFiles('requirements.d/development.txt') }} restore-keys: | - ${{ runner.os }}-pip- - ${{ runner.os }}- + ${{ runner.os }}-${{ runner.arch }}-pip- + ${{ runner.os }}-${{ runner.arch }}- - name: Cache tox environments uses: actions/cache@v4 with: path: .tox - key: ${{ runner.os }}-tox-${{ matrix.toxenv }}-${{ hashFiles('requirements.d/development.txt', 'pyproject.toml') }} + key: ${{ runner.os }}-${{ runner.arch }}-tox-${{ matrix.toxenv }}-${{ hashFiles('requirements.d/development.txt', 'pyproject.toml') }} restore-keys: | - ${{ runner.os }}-tox-${{ matrix.toxenv }}- - ${{ runner.os }}-tox- + ${{ runner.os }}-${{ runner.arch }}-tox-${{ matrix.toxenv }}- + ${{ runner.os }}-${{ runner.arch }}-tox- - name: Install Linux packages if: ${{ runner.os == 'Linux' }}