From 4f127a068b33e8ae84c51faeca7940ceabe691f4 Mon Sep 17 00:00:00 2001 From: Michael Behrisch Date: Tue, 14 Feb 2023 18:21:05 +0100 Subject: [PATCH] skipping pypy and python3.6 wheel build #3 --- .github/workflows/wheel-linux.yml | 10 ++-------- tools/build/build_wheels.sh | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/wheel-linux.yml b/.github/workflows/wheel-linux.yml index 380f05767698..22a2debf020a 100644 --- a/.github/workflows/wheel-linux.yml +++ b/.github/workflows/wheel-linux.yml @@ -135,23 +135,17 @@ jobs: - name: Downloading Wheels artifact uses: actions/download-artifact@v3 - # this step removes the pypy versions to save some space (can be reenabled if someone needs them) - - name: Moving artifacts - run: | - ls -lR - mkdir dist - mv ./*-wheels/* dist - rm -f dist/libsumo*-pypy* dist/libtraci*-pypy* - - name: Publish to Test PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: password: ${{ secrets.TEST_PYPI_TOKEN }} repository_url: https://test.pypi.org/legacy/ skip_existing: true + packages_dir: manylinux-wheels/ - name: Publish to PyPI if: startsWith(github.ref, 'refs/tags') uses: pypa/gh-action-pypi-publish@release/v1 with: password: ${{ secrets.PYPI_TOKEN }} + packages_dir: manylinux-wheels/ diff --git a/tools/build/build_wheels.sh b/tools/build/build_wheels.sh index 4919198525df..ced1e0d61397 100755 --- a/tools/build/build_wheels.sh +++ b/tools/build/build_wheels.sh @@ -35,7 +35,7 @@ echo "base_dir = /github/workspace/_skbuild/linux-x86_64-3.8" >> $HOME/.ccache/c mv dist/eclipse_sumo-* `echo dist/eclipse_sumo-* | sed 's/cp38-cp38/py2.py3-none/'` auditwheel repair dist/eclipse_sumo*.whl cp -a data tools/libsumo -for py in /opt/python/*; do +for py in /opt/python/cp3[1789]*; do rm dist/*.whl $py/bin/pip install scikit-build pminor=`echo $py | sed 's,/opt/python/cp3,,;s/-.*//'`