Skip to content
Snippets Groups Projects
Commit 05addf266f6f authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

wheel: add a platform level to the wheel directories

One day, we will gather all wheel in a single directory and be able to pick the
right one programmatically. This days is not today…

This will help clarify things if we fetch all artifacts at the same time.
parent 2b7e3177f99c
No related branches found
No related tags found
5 merge requests!1083Merge stable into default,!1078fix the pycompat Rust jobs,!1076clone: properly exclude rev-branch-cache from post clone cache warming,!1075prepare for building the Wheel during the release process.,!1063upload nightly build !
......@@ -56,7 +56,8 @@
FLAVOR: ""
MERCURIAL_SETUP_FORCE_TRANSLATIONS: "1"
CI_CLEVER_CLOUD_FLAVOR: "XS"
before_script:
script:
- PLATFORM=`/opt/python/cp313-cp313/bin/python -c 'import sys; print(sys.platform)'`
- echo $WHEEL_TYPE
- test -n "$WHEEL_TYPE"
- echo $FLAVOR
......@@ -60,6 +61,5 @@
- echo $WHEEL_TYPE
- test -n "$WHEEL_TYPE"
- echo $FLAVOR
- mkdir -p wheels/$WHEEL_TYPE/$BUILD_PY_ID
script:
- mkdir -p wheels/$PLATFORM/$WHEEL_TYPE/$BUILD_PY_ID
- /opt/python/$BUILD_PY_ID/bin/python setup.py bdist_wheel --dist-dir tmp-wheelhouse
......@@ -65,4 +65,4 @@
- /opt/python/$BUILD_PY_ID/bin/python setup.py bdist_wheel --dist-dir tmp-wheelhouse
- auditwheel repair tmp-wheelhouse/*.whl -w wheels/$WHEEL_TYPE/$BUILD_PY_ID
- auditwheel repair tmp-wheelhouse/*.whl -w wheels/$PLATFORM/$WHEEL_TYPE/$BUILD_PY_ID
artifacts:
paths:
......@@ -67,6 +67,6 @@
artifacts:
paths:
- wheels/$WHEEL_TYPE/$BUILD_PY_ID
- wheels/
expire_in: 1 week
build-c-wheel:
......@@ -111,9 +111,11 @@
- PORT_START=`expr 19051 + 1009 '*' $CI_CONCURRENT_ID`
- PORT_ARG="--port $PORT_START"
- echo $PORT_ARG
- PLATFORM=`$PYTHON -c 'import sys; print(sys.platform)'`
- echo $PLATFORM
- WHEEL_ARG=""
- SHARDING_ARGS=""
- if test -n "$WHEEL_TYPE"; then
PY_TAG=`$PYTHON -c 'import sys; v=sys.version_info; t=f"cp{v.major}{v.minor}"; print(f"{t}-{t}")'`;
echo "$PY_TAG";
test -n "PY_TAG";
......@@ -114,10 +116,10 @@
- WHEEL_ARG=""
- SHARDING_ARGS=""
- if test -n "$WHEEL_TYPE"; then
PY_TAG=`$PYTHON -c 'import sys; v=sys.version_info; t=f"cp{v.major}{v.minor}"; print(f"{t}-{t}")'`;
echo "$PY_TAG";
test -n "PY_TAG";
WHEEL="`ls -1 $CI_PROJECT_DIR/wheels/$WHEEL_TYPE/$PY_TAG/*.whl`";
WHEEL="`ls -1 $CI_PROJECT_DIR/wheels/$PLATFORM/$WHEEL_TYPE/$PY_TAG/*.whl`";
test -n "$WHEEL";
echo installing from $WHEEL;
WHEEL_ARG="--hg-wheel $WHEEL";
......@@ -429,6 +431,7 @@
variables:
MERCURIAL_SETUP_FORCE_TRANSLATIONS: "1"
script:
- PLATFORM=`$PYTHON -c 'import sys; print(sys.platform)'`
- rm -rf tmp-wheels
- cibuildwheel --output-dir tmp-wheels/
- for py_version in cp38-cp38 cp39-cp39 cp310-cp310 cp311-cp311 cp312-cp312 cp313-cp313; do
......@@ -432,8 +435,8 @@
- rm -rf tmp-wheels
- cibuildwheel --output-dir tmp-wheels/
- for py_version in cp38-cp38 cp39-cp39 cp310-cp310 cp311-cp311 cp312-cp312 cp313-cp313; do
mkdir -p wheels/c/$py_version/;
mv tmp-wheels/*$py_version*.whl wheels/c/$py_version/;
mkdir -p wheels/$PLATFORM/c/$py_version/;
mv tmp-wheels/*$py_version*.whl wheels/$PLATFORM/c/$py_version/;
done
- rm -rf tmp-wheels
artifacts:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment