Skip to content

Commit

Permalink
more build path adaptions #3
Browse files Browse the repository at this point in the history
  • Loading branch information
behrisch committed Nov 9, 2023
1 parent e95321e commit c0a307c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
uses: docker/build-push-action@v4
with:
context: .
file: build/docker/Dockerfile.ubuntu.git
file: build_config/docker/Dockerfile.ubuntu.git
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
8 changes: 4 additions & 4 deletions .github/workflows/wheel-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,23 @@ jobs:
run: |
cd tools
python -m pip install build
python build/version.py build/setup-sumolib.py ./setup.py
python build_config/version.py build_config/setup-sumolib.py ./setup.py
python -m build -o ../wheelhouse
python build/version.py build/setup-traci.py ./setup.py
python build_config/version.py build_config/setup-traci.py ./setup.py
python -m build -o ../wheelhouse
- name: Building SUMO / libsumo Python wheels (latest manylinux docker)
# if: github.repository == 'DLR-TS/sumo'
uses: docker://quay.io/pypa/manylinux2014_x86_64
with:
entrypoint: tools/build/build_wheels.sh
entrypoint: tools/build_config/build_wheels.sh

# the next two steps are only needed when we debug the manylinux build
# - name: Building Python wheels (fixed manylinux docker)
# if: github.repository == 'eclipse-sumo/sumo'
# uses: docker://quay.io/pypa/manylinux2014_x86_64:2022-11-14-1226cfc
# with:
# entrypoint: tools/build/build_wheels.sh
# entrypoint: tools/build_config/build_wheels.sh

# - name: Uploading raw wheels (without auditwheel being applied)
# uses: actions/upload-artifact@v3
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/wheel-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ jobs:
run: |
python3 -m pip install --upgrade pip
python3 -m pip install build
cp build/pyproject.toml .
python3 tools/build/version.py tools/build/setup-sumo.py ./setup.py
cp build_config/pyproject.toml .
python3 tools/build_config/version.py tools/build_config/setup-sumo.py ./setup.py
python3 -m build --wheel
python3 tools/build/version.py tools/build/setup-libsumo.py tools/setup.py
python3 tools/build_config/version.py tools/build_config/setup-libsumo.py tools/setup.py
python3 -m build --wheel tools -o dist
python3 tools/build/version.py tools/build/setup-libtraci.py tools/setup.py
python3 tools/build_config/version.py tools/build_config/setup-libtraci.py tools/setup.py
python3 -m build --wheel tools -o dist
if [[ "${{ matrix.python_version }}" != "3.8" ]]; then rm dist/eclipse_sumo-*; fi
if [[ "${{ matrix.python_version }}" == "3.8" ]]; then mv dist/eclipse_sumo-* `echo dist/eclipse_sumo-* | sed 's/cp38-cp38/py2.py3-none/'`; fi
Expand Down Expand Up @@ -126,9 +126,9 @@ jobs:
run: |
cd tools
python3 -m pip install build
python3 build/version.py build/setup-sumolib.py ./setup.py
python3 build_config/version.py build_config/setup-sumolib.py ./setup.py
python3 -m build --wheel
python3 build/version.py build/setup-traci.py ./setup.py
python3 build_config/version.py build_config/setup-traci.py ./setup.py
python3 -m build --wheel
- name: Running libsumo tests
Expand Down

0 comments on commit c0a307c

Please sign in to comment.