Mercurial > hg
changeset 52203:5ea21e0c28aa stable
ci: automatically compute the python tag we use to identify tag
This make the determination more automatic and less error prone. In addition,
this will make it possible to run on a runner without a pre-determined Python
version, like what we do for the macos and windows workers.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 08 Nov 2024 02:02:32 +0100 |
| parents | 069735062524 |
| children | f8d5001dd03e |
| files | contrib/heptapod-ci.yml |
| diffstat | 1 files changed, 4 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/heptapod-ci.yml Fri Nov 08 02:50:34 2024 +0100 +++ b/contrib/heptapod-ci.yml Fri Nov 08 02:02:32 2024 +0100 @@ -93,11 +93,12 @@ script: - echo "$RUNTEST_ARGS" - echo "$WHEEL_TYPE" - - echo $BUILD_PY_ID - WHEEL="" - if test -n "$WHEEL_TYPE"; then - test -n "$BUILD_PY_ID"; - WHEEL="`ls -1 $CI_PROJECT_DIR/wheels/$WHEEL_TYPE/$BUILD_PY_ID/*.whl`"; + 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`"; test -n "$WHEEL"; fi - if test -n "$WHEEL"; then @@ -141,7 +142,6 @@ variables: WHEEL_TYPE: "c" - BUILD_PY_ID: "cp311-cp311" RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt" TEST_HGTESTS_ALLOW_NETIO: "1" @@ -177,7 +177,6 @@ variables: PYTHON: python3.8 WHEEL_TYPE: "c" - BUILD_PY_ID: "cp38-cp38" RUNTEST_ARGS: " --blacklist /tmp/check-tests.txt" TEST_HGTESTS_ALLOW_NETIO: "1" needs: @@ -193,7 +192,6 @@ variables: PYTHON: python3.12 WHEEL_TYPE: "c" - BUILD_PY_ID: "cp312-cp312" RUNTEST_ARGS: " --blacklist /tmp/check-tests.txt" TEST_HGTESTS_ALLOW_NETIO: "1" needs: @@ -216,7 +214,6 @@ variables: PYTHON: python3.13 WHEEL_TYPE: "c" - BUILD_PY_ID: "cp313-cp313" RUNTEST_ARGS: " --blacklist /tmp/check-tests.txt" TEST_HGTESTS_ALLOW_NETIO: "1" needs: