Skip to content

Commit

Permalink
backport main branch CI to 39.0.x (#8153)
Browse files Browse the repository at this point in the history
* backport main branch CI to 39.0.x

* missed this one

* fix boring binding (backport of #8091)

* more ports

* re-add 2_24

* aarch64 too

* Update .github/workflows/wheel-builder.yml

Co-authored-by: Alex Gaynor <alex.gaynor@gmail.com>

---------

Co-authored-by: Alex Gaynor <alex.gaynor@gmail.com>
  • Loading branch information
reaperhulk and alex authored Jan 29, 2023
1 parent 338a65a commit 111deef
Show file tree
Hide file tree
Showing 12 changed files with 398 additions and 334 deletions.
35 changes: 0 additions & 35 deletions .circleci/build-wheel.sh

This file was deleted.

112 changes: 0 additions & 112 deletions .circleci/config.yml

This file was deleted.

13 changes: 5 additions & 8 deletions .github/workflows/build_openssl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,12 @@ elif [[ "${TYPE}" == "boringssl" ]]; then
git checkout "${VERSION}"
mkdir build
pushd build
cmake .. -DCMAKE_POSITION_INDEPENDENT_CODE=ON
# Find the default rust target based on what rustc is built for
cmake .. -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DRUST_BINDINGS="$(rustc -V --verbose | grep 'host: ' | sed 's/host: //')" -DCMAKE_INSTALL_PREFIX="${OSSL_PATH}"
make -j"$(nproc)"
mkdir -p "${OSSL_PATH}/lib/"
mkdir -p "${OSSL_PATH}/include/"
mkdir -p "${OSSL_PATH}/bin/"
cp -r ../include/openssl "${OSSL_PATH}/include/"
cp ssl/libssl.a "${OSSL_PATH}/lib/"
cp crypto/libcrypto.a "${OSSL_PATH}/lib/"
cp tool/bssl "${OSSL_PATH}/bin/openssl"
make install
# BoringSSL doesn't have a bin/openssl and we use that to detect success
touch "${OSSL_PATH}/bin/openssl"
popd
popd
fi
Loading

0 comments on commit 111deef

Please sign in to comment.