Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,11 @@ jobs:
context: .
push: true
tags: p4lang/third-party:${{ steps.get-tag.outputs.tag }}
- name: Build and push Dockerfile.24 image if needed
if: ${{ github.repository == 'p4lang/third-party' && github.event_name == 'push' }}
uses: docker/build-push-action@v2
with:
context: .
file: Dockerfile.24
push: true
tags: p4lang/third-party:${{ steps.get-tag.outputs.tag }}-24
5 changes: 5 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ RUN apt-get update -qq && apt-get install -qq --no-install-recommends \
ldconfig && \
mkdir -p /output/usr/local

RUN pip3 install "Cython<3"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need Cython<3? here?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was added during local builds because some grpc python build steps
failed with Cython 3 on Ubuntu 24.04. Pinning Cython<3 ensured the grpc
python package could be compiled successfully.

If this constraint is no longer necessary for the current dependency
versions, I am happy to remove it.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, let's see if we can remove it to keep things simple.


# Build ccache.
FROM base-builder as ccache
ENV RUN_FROM_BUILD_FARM=yes
Expand Down Expand Up @@ -197,7 +199,10 @@ RUN export PYTHON3_VERSION=`python3 -c 'import sys; version=sys.version_info[:3]
# We don't use `--ignore-installed` here because otherwise we won't use the
# installed version of the protobuf python package that we copied from the
# protobuf build image.


RUN pip3 install --user -rrequirements.txt
RUN pip3 install --user "Cython==0.29.36"
RUN env GRPC_PYTHON_BUILD_WITH_CYTHON=1 pip3 install --user --ignore-installed .

# Build libyang
Expand Down
Loading
Loading