MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move auditwheel back from venv

This commit is contained in:
JuniorJPDJ 2022-11-27 10:23:14 +00:00
parent 375a211f57
commit 5be2148ee5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitlab-ci.yml
View File

@ -2,9 +2,6 @@ variables:
IMAGE_NAME: funkwhale/funkwhale IMAGE_NAME: funkwhale/funkwhale
IMAGE: $IMAGE_NAME:$CI_COMMIT_REF_NAME IMAGE: $IMAGE_NAME:$CI_COMMIT_REF_NAME
IMAGE_LATEST: $IMAGE_NAME:latest IMAGE_LATEST: $IMAGE_NAME:latest
ALL_IN_ONE_IMAGE_NAME: funkwhale/all-in-one
ALL_IN_ONE_IMAGE: $ALL_IN_ONE_IMAGE_NAME:$CI_COMMIT_REF_NAME
ALL_IN_ONE_IMAGE_LATEST: $ALL_IN_ONE_IMAGE_NAME:latest
PIP_CACHE_DIR: "$CI_PROJECT_DIR/.pip" PIP_CACHE_DIR: "$CI_PROJECT_DIR/.pip"
CARGO_HOME: "$CI_PROJECT_DIR/.cargo" CARGO_HOME: "$CI_PROJECT_DIR/.cargo"
PYTHONDONTWRITEBYTECODE: "true" PYTHONDONTWRITEBYTECODE: "true"
@ -60,9 +57,10 @@ stages:
poetry poetry
py3-pip py3-pip
patchelf patchelf
- pip install auditwheel
- cd api ; poetry export --without-hashes > ../requirements.txt ; cd .. - cd api ; poetry export --without-hashes > ../requirements.txt ; cd ..
- python -m venv venv - python -m venv venv
- venv/bin/pip install --upgrade pip wheel auditwheel - venv/bin/pip install --upgrade pip wheel
- venv/bin/pip debug --verbose - venv/bin/pip debug --verbose
script: script:
# build basic wheels # build basic wheels
@ -75,7 +73,7 @@ stages:
- | - |
for wheel in wheelhouse/* ; do for wheel in wheelhouse/* ; do
echo "Correcting tags for $wheel" echo "Correcting tags for $wheel"
corrected_tag="$(venv/bin/python3 -c "import auditwheel.wheel_abi; print(auditwheel.wheel_abi.analyze_wheel_abi('$wheel').overall_tag)" || true)" corrected_tag="$(python3 -c "import auditwheel.wheel_abi; print(auditwheel.wheel_abi.analyze_wheel_abi('$wheel').overall_tag)" || true)"
echo "New tag: $corrected_tag" echo "New tag: $corrected_tag"
[[ "$wheel" = "*$corrected_tag*" ]] && { echo 'Tag already correct or correct tag is unknown - skipping.' ; continue ; } [[ "$wheel" = "*$corrected_tag*" ]] && { echo 'Tag already correct or correct tag is unknown - skipping.' ; continue ; }
@ -88,13 +86,14 @@ stages:
# prepare musllinux universal wheels # prepare musllinux universal wheels
- | - |
for wheel in wheelhouse/* ; do for wheel in wheelhouse/* ; do
venv/bin/auditwheel repair --strip "$wheel" || true auditwheel repair --strip "$wheel" || true
done done
# remove basic wheels as we have universal wheels now # remove basic wheels as we have universal wheels now
- rm -f wheelhouse/*-linux*.whl wheelhouse/*.linux*.whl - rm -f wheelhouse/*-linux*.whl wheelhouse/*.linux*.whl
- ls -l wheelhouse - ls -l wheelhouse
## populate cache with universal wheels for next runs ## populate cache with universal wheels for next runs
#- pip install wheelhouse/*.whl #- pip install wheelhouse/*.whl
# doesn't work, need to find other way
artifacts: artifacts:
paths: paths:
- wheelhouse - wheelhouse
@ -110,3 +109,4 @@ build_dep_wheels_riscv64:
variables: variables:
DOCKER_ARCH: riscv64 DOCKER_ARCH: riscv64
image: ${DOCKER_ARCH}/alpine:edge image: ${DOCKER_ARCH}/alpine:edge
allow_failure: true