Skip to content

Commit 111deef

Browse files
reaperhulkalex
andauthored
backport main branch CI to 39.0.x (#8153)
* 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>
1 parent 338a65a commit 111deef

12 files changed

+398
-334
lines changed

.circleci/build-wheel.sh

-35
This file was deleted.

.circleci/config.yml

-112
This file was deleted.

.github/workflows/build_openssl.sh

+5-8
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,12 @@ elif [[ "${TYPE}" == "boringssl" ]]; then
6868
git checkout "${VERSION}"
6969
mkdir build
7070
pushd build
71-
cmake .. -DCMAKE_POSITION_INDEPENDENT_CODE=ON
71+
# Find the default rust target based on what rustc is built for
72+
cmake .. -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DRUST_BINDINGS="$(rustc -V --verbose | grep 'host: ' | sed 's/host: //')" -DCMAKE_INSTALL_PREFIX="${OSSL_PATH}"
7273
make -j"$(nproc)"
73-
mkdir -p "${OSSL_PATH}/lib/"
74-
mkdir -p "${OSSL_PATH}/include/"
75-
mkdir -p "${OSSL_PATH}/bin/"
76-
cp -r ../include/openssl "${OSSL_PATH}/include/"
77-
cp ssl/libssl.a "${OSSL_PATH}/lib/"
78-
cp crypto/libcrypto.a "${OSSL_PATH}/lib/"
79-
cp tool/bssl "${OSSL_PATH}/bin/openssl"
74+
make install
75+
# BoringSSL doesn't have a bin/openssl and we use that to detect success
76+
touch "${OSSL_PATH}/bin/openssl"
8077
popd
8178
popd
8279
fi

0 commit comments

Comments
 (0)