Skip to content

Commit 80078c3

Browse files
authored
install bindgen from cargo instead of apt (#13678)
* install bindgen from cargo instead of apt this only impacts boring/aws-lc * Modify cache key format in CI workflow Updated the cache key in CI workflow to include a version suffix.
1 parent e78ea5a commit 80078c3

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ jobs:
117117
echo "CFLAGS=${CFLAGS} -Werror=implicit-function-declaration" >> $GITHUB_ENV
118118
echo "RUSTFLAGS=-Clink-arg=-Wl,-rpath=${OSSL_PATH}/lib -Clink-arg=-Wl,-rpath=${OSSL_PATH}/lib64" >> $GITHUB_ENV
119119
if: matrix.PYTHON.OPENSSL
120-
- run: sudo apt-get install -y bindgen
120+
- run: cargo install bindgen-cli
121121
if: matrix.PYTHON.OPENSSL.TYPE == 'boringssl' || matrix.PYTHON.OPENSSL.TYPE == 'aws-lc'
122122
- name: Cache rust and pip
123123
uses: ./.github/actions/cache
@@ -126,7 +126,7 @@ jobs:
126126
# We have both the Python version from the matrix and from the
127127
# setup-python step because the latter doesn't distinguish
128128
# pypy3-3.8 and pypy3-3.9 -- both of them show up as 7.3.11.
129-
key: ${{ matrix.PYTHON.VERSION }}-${{ steps.setup-python.outputs.python-version }}-${{ matrix.PYTHON.NOXSESSION }}-${{ env.OPENSSL_HASH }}
129+
key: "${{ matrix.PYTHON.VERSION }}-${{ steps.setup-python.outputs.python-version }}-${{ matrix.PYTHON.NOXSESSION }}-${{ env.OPENSSL_HASH }}-0"
130130

131131
- run: python -m pip install -c ci-constraints-requirements.txt 'nox[uv]' 'tomli; python_version < "3.11"'
132132
- name: Create nox environment

0 commit comments

Comments
 (0)